Cleanup of cmakelists. No functional change.