Further cmake cleanup