Ditch the earlier command system