Some more cmake cleanup