diff --git a/packages/edit-post/src/blockMediaPanel/coverControls.tsx b/packages/edit-post/src/blockMediaPanel/coverControls.tsx
index b000a7ac..5259a997 100644
--- a/packages/edit-post/src/blockMediaPanel/coverControls.tsx
+++ b/packages/edit-post/src/blockMediaPanel/coverControls.tsx
@@ -50,13 +50,11 @@ export function CoverControls( props: CoverControlsProps ) {
 				onSuccess={ onChange }
 			/>
 			{ 'video' === props.attributes.backgroundType ? (
-				<>
-					<MuteVideo
-						id={ props.attributes.id }
-						url={ props.attributes.url }
-						onChange={ onChange }
-					/>
-				</>
+				<MuteVideo
+					id={ props.attributes.id }
+					url={ props.attributes.url }
+					onChange={ onChange }
+				/>
 			) : null }
 			<DebugInfo id={ props.attributes.id } />
 		</Fragment>
diff --git a/packages/edit-post/src/blockMediaPanel/index.tsx b/packages/edit-post/src/blockMediaPanel/index.tsx
index 3f0bbd07..2bb16fd7 100644
--- a/packages/edit-post/src/blockMediaPanel/index.tsx
+++ b/packages/edit-post/src/blockMediaPanel/index.tsx
@@ -43,59 +43,27 @@ type PerBlockControlsProps = MediaPanelProps;
 function PerBlockControls( props: PerBlockControlsProps ) {
 	switch ( props.name ) {
 		case 'core/video':
-			return (
-				<>
-					<VideoControls { ...props } />
-				</>
-			);
+			return <VideoControls { ...props } />;
 		case 'core/image':
-			return (
-				<>
-					<ImageControls { ...props } />
-				</>
-			);
+			return <ImageControls { ...props } />;
 
 		case 'core/audio':
-			return (
-				<>
-					<AudioControls { ...props } />
-				</>
-			);
+			return <AudioControls { ...props } />;
 
 		case 'core/media-text':
-			return (
-				<>
-					<MediaTextControls { ...props } />
-				</>
-			);
+			return <MediaTextControls { ...props } />;
 
 		case 'core/gallery':
-			return (
-				<>
-					<GalleryControls { ...props } />
-				</>
-			);
+			return <GalleryControls { ...props } />;
 
 		case 'core/cover':
-			return (
-				<>
-					<CoverControls { ...props } />
-				</>
-			);
+			return <CoverControls { ...props } />;
 
 		case 'core/post-featured-image':
-			return (
-				<>
-					<PostFeaturedImageControls />
-				</>
-			);
+			return <PostFeaturedImageControls />;
 
 		case 'core/site-logo':
-			return (
-				<>
-					<SiteLogoControls { ...props } />
-				</>
-			);
+			return <SiteLogoControls { ...props } />;
 
 		default:
 			return null;
diff --git a/packages/edit-post/src/blockMediaPanel/mediaTextControls.tsx b/packages/edit-post/src/blockMediaPanel/mediaTextControls.tsx
index 8b9cba42..3aee6ec1 100644
--- a/packages/edit-post/src/blockMediaPanel/mediaTextControls.tsx
+++ b/packages/edit-post/src/blockMediaPanel/mediaTextControls.tsx
@@ -49,13 +49,11 @@ export function MediaTextControls( props: MediaTextControlsProps ) {
 				onSuccess={ onChange }
 			/>
 			{ 'video' === props.attributes.mediaType ? (
-				<>
-					<MuteVideo
-						id={ props.attributes.mediaId }
-						url={ props.attributes.mediaUrl }
-						onChange={ onChange }
-					/>
-				</>
+				<MuteVideo
+					id={ props.attributes.mediaId }
+					url={ props.attributes.mediaUrl }
+					onChange={ onChange }
+				/>
 			) : null }
 			<DebugInfo id={ props.attributes.mediaId } />
 		</Fragment>
diff --git a/packages/edit-post/src/blockMediaPanel/recordingControls.tsx b/packages/edit-post/src/blockMediaPanel/recordingControls.tsx
index b877fc4f..bbc1384b 100644
--- a/packages/edit-post/src/blockMediaPanel/recordingControls.tsx
+++ b/packages/edit-post/src/blockMediaPanel/recordingControls.tsx
@@ -58,18 +58,15 @@ function InputControls() {
 	} ) );
 
 	// Videos can be recorded with or without audio.
-	const audioControls = [
-		...audioDevices.map( ( device ) => ( {
-			title: device.label,
-			onClick: () => {
-				void setAudioInput( device.deviceId );
-			},
-			isActive: audioInput === device.deviceId,
-			role: 'menuitemradio',
-			icon:
-				hasAudio && audioInput === device.deviceId ? check : undefined,
-		} ) ),
-	];
+	const audioControls = audioDevices.map( ( device ) => ( {
+		title: device.label,
+		onClick: () => {
+			void setAudioInput( device.deviceId );
+		},
+		isActive: audioInput === device.deviceId,
+		role: 'menuitemradio',
+		icon: hasAudio && audioInput === device.deviceId ? check : undefined,
+	} ) );
 
 	if ( 'video' === recordingType ) {
 		audioControls.unshift( {
diff --git a/packages/edit-post/src/crossOriginIsolation/index.ts b/packages/edit-post/src/crossOriginIsolation/index.ts
index fdf3fc7f..93fef313 100644
--- a/packages/edit-post/src/crossOriginIsolation/index.ts
+++ b/packages/edit-post/src/crossOriginIsolation/index.ts
@@ -9,6 +9,30 @@ function forceCrossOrigin( imgCrossOrigin: CrossOriginValue, url: string ) {
 	return 'anonymous' as CrossOriginValue;
 }
 
+async function waitForChildren( element: Element ) {
+	return new Promise< void >( ( resolve ) => {
+		if ( ! element ) {
+			return resolve();
+		}
+
+		if ( element.children.length ) {
+			return resolve();
+		}
+
+		const obs = new MutationObserver( () => {
+			if ( element.children.length ) {
+				obs.disconnect();
+				resolve();
+			}
+		} );
+
+		obs.observe( element, {
+			childList: true,
+			subtree: true,
+		} );
+	} );
+}
+
 if ( window.crossOriginIsolated ) {
 	addFilter(
 		'media.crossOrigin',
@@ -66,30 +90,6 @@ if ( window.crossOriginIsolated ) {
 		} );
 	} );
 
-	async function waitForChildren( element: Element ) {
-		return new Promise< void >( ( resolve ) => {
-			if ( ! element ) {
-				return resolve();
-			}
-
-			if ( element.children.length ) {
-				return resolve();
-			}
-
-			const obs = new MutationObserver( () => {
-				if ( element.children.length ) {
-					observer.disconnect();
-					resolve();
-				}
-			} );
-
-			obs.observe( element, {
-				childList: true,
-				subtree: true,
-			} );
-		} );
-	}
-
 	const unsubscribe = subscribe( async () => {
 		const wrapperEl = document.querySelector(
 			'.edit-post-layout__metaboxes'
diff --git a/packages/edit-post/src/preferencesModal/modal.tsx b/packages/edit-post/src/preferencesModal/modal.tsx
index 6b446dba..886daac6 100644
--- a/packages/edit-post/src/preferencesModal/modal.tsx
+++ b/packages/edit-post/src/preferencesModal/modal.tsx
@@ -171,136 +171,123 @@ export function Modal() {
 				name: 'general',
 				tabLabel: __( 'General', 'media-experiments' ),
 				content: (
-					<>
-						<PreferencesModalSection
-							title={ __( 'General', 'media-experiments' ) }
-							description={ __(
-								'Customize options related to the media optimization flow.',
+					<PreferencesModalSection
+						title={ __( 'General', 'media-experiments' ) }
+						description={ __(
+							'Customize options related to the media optimization flow.',
+							'media-experiments'
+						) }
+					>
+						<EnableFeature
+							featureName="requireApproval"
+							help={ __(
+								'Require approval step when optimizing existing videos or images.',
 								'media-experiments'
 							) }
-						>
-							<EnableFeature
-								featureName="requireApproval"
-								help={ __(
-									'Require approval step when optimizing existing videos or images.',
-									'media-experiments'
-								) }
-								label={ __( 'Approval', 'media-experiments' ) }
-							/>
-							<SelectFeature
-								featureName="imageFormat"
-								help={ __(
-									'Preferred file format when converting images.',
-									'media-experiments'
-								) }
-								label={ __(
-									'Image Format',
-									'media-experiments'
-								) }
-								options={ [
-									{
-										label: __(
-											'JPEG (Browser)',
-											'media-experiments'
-										),
-										value: 'jpeg-browser',
-									},
-									{
-										label: __(
-											'WebP (Browser)',
-											'media-experiments'
-										),
-										value: 'webp-browser',
-										disabled: isSafari,
-									},
-									{
-										label: __(
-											'WebP (FFmpeg)',
-											'media-experiments'
-										),
-										value: 'webp-ffmpeg',
-									},
-									{
-										label: __(
-											'JPEG (libvips)',
-											'media-experiments'
-										),
-										value: 'jpeg-vips',
-									},
-									{
-										label: __(
-											'JPEG (MozJPEG)',
-											'media-experiments'
-										),
-										value: 'jpeg-mozjpeg',
-									},
-									{
-										label: __(
-											'AVIF (libavif)',
-											'media-experiments'
-										),
-										value: 'avif',
-									},
-								] }
-							/>
-							{ /* default for jpeg: 82, for webp: 86 */ }
-							<FeatureNumberControl
-								className="interface-preferences-modal__option interface-preferences-modal__option--number"
-								label={ __(
-									'Image Quality',
-									'media-experiments'
-								) }
-								isShiftStepEnabled={ true }
-								featureName="imageQuality"
-								shiftStep={ 5 }
-								max={ 100 }
-								min={ 1 }
-							/>
-						</PreferencesModalSection>
-					</>
+							label={ __( 'Approval', 'media-experiments' ) }
+						/>
+						<SelectFeature
+							featureName="imageFormat"
+							help={ __(
+								'Preferred file format when converting images.',
+								'media-experiments'
+							) }
+							label={ __( 'Image Format', 'media-experiments' ) }
+							options={ [
+								{
+									label: __(
+										'JPEG (Browser)',
+										'media-experiments'
+									),
+									value: 'jpeg-browser',
+								},
+								{
+									label: __(
+										'WebP (Browser)',
+										'media-experiments'
+									),
+									value: 'webp-browser',
+									disabled: isSafari,
+								},
+								{
+									label: __(
+										'WebP (FFmpeg)',
+										'media-experiments'
+									),
+									value: 'webp-ffmpeg',
+								},
+								{
+									label: __(
+										'JPEG (libvips)',
+										'media-experiments'
+									),
+									value: 'jpeg-vips',
+								},
+								{
+									label: __(
+										'JPEG (MozJPEG)',
+										'media-experiments'
+									),
+									value: 'jpeg-mozjpeg',
+								},
+								{
+									label: __(
+										'AVIF (libavif)',
+										'media-experiments'
+									),
+									value: 'avif',
+								},
+							] }
+						/>
+						{ /* default for jpeg: 82, for webp: 86 */ }
+						<FeatureNumberControl
+							className="interface-preferences-modal__option interface-preferences-modal__option--number"
+							label={ __( 'Image Quality', 'media-experiments' ) }
+							isShiftStepEnabled={ true }
+							featureName="imageQuality"
+							shiftStep={ 5 }
+							max={ 100 }
+							min={ 1 }
+						/>
+					</PreferencesModalSection>
 				),
 			},
 			{
 				name: 'recording',
 				tabLabel: __( 'Recording', 'media-experiments' ),
 				content: (
-					<>
-						<PreferencesModalSection
-							title={ __( 'Recording', 'media-experiments' ) }
-							description={ __(
-								'Customize options related to the media recording functionality.',
+					<PreferencesModalSection
+						title={ __( 'Recording', 'media-experiments' ) }
+						description={ __(
+							'Customize options related to the media recording functionality.',
+							'media-experiments'
+						) }
+					>
+						<SelectFeature
+							featureName="videoInput"
+							help={ __(
+								'Default camera to use when recording video or taking pictures.',
+								'media-experiments'
+							) }
+							label={ __( 'Camera', 'media-experiments' ) }
+							options={ videoDevices.map( ( device ) => ( {
+								label: device.label,
+								value: device.deviceId,
+							} ) ) }
+						/>
+						<SelectFeature
+							featureName="audioInput"
+							help={ __(
+								'Default microphone to use when recording video / audio.',
 								'media-experiments'
 							) }
-						>
-							<SelectFeature
-								featureName="videoInput"
-								help={ __(
-									'Default camera to use when recording video or taking pictures.',
-									'media-experiments'
-								) }
-								label={ __( 'Camera', 'media-experiments' ) }
-								options={ videoDevices.map( ( device ) => ( {
-									label: device.label,
-									value: device.deviceId,
-								} ) ) }
-							/>
-							<SelectFeature
-								featureName="audioInput"
-								help={ __(
-									'Default microphone to use when recording video / audio.',
-									'media-experiments'
-								) }
-								label={ __(
-									'Microphone',
-									'media-experiments'
-								) }
-								options={ audioDevices.map( ( device ) => ( {
-									label: device.label,
-									value: device.deviceId,
-								} ) ) }
-							/>
-						</PreferencesModalSection>
-					</>
+							label={ __( 'Microphone', 'media-experiments' ) }
+							options={ audioDevices.map( ( device ) => ( {
+								label: device.label,
+								value: device.deviceId,
+							} ) ) }
+						/>
+					</PreferencesModalSection>
 				),
 			},
 		],
diff --git a/packages/jsquash/src/index.ts b/packages/jsquash/src/index.ts
index 98d97212..c9800ac5 100644
--- a/packages/jsquash/src/index.ts
+++ b/packages/jsquash/src/index.ts
@@ -34,8 +34,6 @@ export async function convertImageToJpeg( file: File ) {
 			fileName,
 			'image/jpeg'
 		);
-	} catch ( err ) {
-		throw err;
 	} finally {
 		URL.revokeObjectURL( url );
 	}
@@ -74,8 +72,6 @@ export async function convertImageToAvif( file: File ) {
 			fileName,
 			'image/avif'
 		);
-	} catch ( err ) {
-		throw err;
 	} finally {
 		URL.revokeObjectURL( url );
 	}