Moved some more code to twig
Removed unused code from ObjectBuilder