We should remove the dependency except in the cases they are dragged in via sharding (handled separately)