More Cleanup to build