Delete command refactoring.
Added return value to setup command.