There are a lot of layer violations within the sharding code. This ticket is filed as a catch all ticket for those cleanups.