more cmake cleanup