buildscript clean up