Removed old goals from CMakeLists, docfix