Cleanup the class to not use the CommandWithUpgrade class. Maybe later