Remove command.rb and simplify all running