Types: deprecate more entries