cleanup
fix buildout