CMake fixes (removed unuded stuff)