2071: Removed the last armor reference from the code as well as cleaned YieldTypes for all yields not present in the code at all