Cleaning up CMAKE
Cleaning up CMAKE