CMS-2925 Remove PageComponent templates
Fixed compilation errors