CMake clean up. still needs more.