Cleanup of non-stable cmake