strip out armory support