Simplify buildout