hacking build system
cleanup