Cmake cleanup