Build system cleanup