Framework: Remove deprecations slated for v3.5 removal

core-blocks/test/full-content.js

@@ -87,8 +87,6 @@ function normalizeParsedBlocks( blocks ) {
 
 		// Change client IDs to a predictable value
 		block.clientId = '_clientId_' + index;
-		// TODO: Remove in 3.5 "UID" deprecation.
-		delete block.uid;
 
 		// Walk each attribute and get a more concise representation of any
 		// React elements

packages/blocks/src/api/factory.js

@@ -58,8 +58,6 @@ export function createBlock( name, blockAttributes = {}, innerBlocks = [] ) {
 	// attributes, and their inner blocks.
 	return {
 		clientId,
-		// TODO: Remove from block interface in 3.5 "UID" deprecation.
-		uid: clientId,
 		name,
 		isValid: true,
 		attributes,
@@ -83,8 +81,6 @@ export function cloneBlock( block, mergeAttributes = {}, newInnerBlocks ) {
 	return {
 		...block,
 		clientId,
-		// TODO: Remove from block interface in 3.5 "UID" deprecation.
-		uid: uuid(),
 		attributes: {
 			...block.attributes,
 			...mergeAttributes,

packages/blocks/src/api/test/factory.js

@@ -1024,9 +1024,9 @@ describe( 'block factory', () => {
 
 			const transformedBlocks = switchToBlockType( block, 'core/updated-text-block' );
 
-			// Make sure the block UIDs are set as expected: the first
+			// Make sure the block client IDs are set as expected: the first
 			// transformed block whose type matches the "destination" type gets
-			// to keep the existing block's UID.
+			// to keep the existing block's client ID.
 			expect( transformedBlocks ).toHaveLength( 2 );
 			expect( transformedBlocks[ 0 ] ).toHaveProperty( 'clientId' );
 			expect( transformedBlocks[ 0 ].clientId ).not.toBe( block.clientId );