cleaned up the cmake mess i've made