clean up/unify build system