Apply review comments and cleanup shard closing