Further cleanup of cmakelists