Bit of clean up

packages/components/src/higher-order/with-filters/index.tsx

@@ -52,7 +52,7 @@ export default function withFilters( hookName: string ) {
 		 * reuse this shared reference as an optimization to avoid excessive
 		 * calls to `applyFilters` when many instances exist.
 		 */
-		let FilteredComponent: React.ComponentType | undefined;
+		let FilteredComponent: React.ComponentType;
 
 		/**
 		 * Initializes the FilteredComponent variable once, if not already
@@ -94,19 +94,15 @@ export default function withFilters( hookName: string ) {
 					);
 
 				// If this was the last of the mounted components filtered on
-				// this hook, remove the hook handler and reset the shared
-				// FilteredComponent reference so that it's recreated on next
-				// mount.
+				// this hook, remove the hook handler.
 				if ( FilteredComponentRenderer.instances.length === 0 ) {
 					removeAction( 'hookRemoved', namespace );
 					removeAction( 'hookAdded', namespace );
-					// FilteredComponent = undefined;
 				}
 			}
 
 			render() {
-				const NonNullFilteredComponent = FilteredComponent!;
-				return <NonNullFilteredComponent { ...this.props } />;
+				return <FilteredComponent { ...this.props } />;
 			}
 		}
 

packages/edit-site/src/components/block-editor/providers/content-block-editor-provider.js

@@ -16,12 +16,7 @@ const { ExperimentalBlockEditorProvider } = unlock( blockEditorPrivateApis );
 const noop = () => {};
 
 export default function ContentBlockEditorProvider( { children } ) {
-	const defaultSettings = useSiteEditorSettings();
-	const settings = useMemo( () => {
-		return {
-			...defaultSettings,
-		};
-	}, [ defaultSettings ] );
+	const settings = useSiteEditorSettings();
 
 	const blocks = useMemo( () => {
 		return [

packages/edit-site/src/components/page-content-focus-manager/disable-non-page-content-blocks.js

@@ -39,12 +39,11 @@ export function useDisableNonPageContentBlocks() {
 			'core/edit-site/disable-non-content-blocks',
 			withDisableNonPageContentBlocks
 		);
-		return () => {
+		return () =>
 			removeFilter(
 				'editor.BlockEdit',
 				'core/edit-site/disable-non-content-blocks'
 			);
-		};
 	}, [] );
 }