Clean up CMake files

Supersedes #158
There we go, added back :-)