Remove need for PageBuilder
Remove need for PageBuilder