general build cleanup
22 files changed