Simplifications to the buildout