Cleaned up commands and command stubs