cleanup around build system