CMake

Playing cleanup...