Clean up Shard a bit