simplify buildout more