Further cleaning of cmake project files