Logic found in cluster_remove_shard should be moved to _configsvrRemoveShard. Additionally, unit tests using the removeShard logic bundle should be moved out of the shardingCatalogTest file into its own test file, and changed to not go over the mock network for config (but still does for shards).