Revert "Shuffle and commands"

This reverts commit 4e313eb50a22a8eedc90090b02e5c54369a4a863.