Cleaning up cmakelists