some more cmake cleanup