Pre build cleanup