Clean up CMake and remove lots of old cruft