Removed Command-based crap