Build system clean up