Removed content and layout id field