Simplify sharded and stand-alone cases