CMake clean-up
Merge branch 'cmake_clean-up'