More Cleanup related to subprojects.