top-level cmakelist.txt cleanup