Housekeeping

Trying to clean up some of the cmake files.