Remove extraneous registration

This avoids the problem of deadlocks on object_cluster_map by removing a lot of the map-generation code.