Revert "Allow command options"

This reverts commit d46f45e10d77b4cb2bba551c55865be8b655d63c.
debug