Scrub internal ID from all layouts - CRED UI Review 8