Removed use of old command system entirely