Add return annotation for unregisterShuffle