Cleanup to make more project specific