Remove dead code that now lives in the shards