Merge pull request #4808 from Orphis/cmake_cleanup CMake cleanup: start organizing targets, remove some unwanted ones
