Removing deprecated types codegenerators