Final rule cleanup