- remove references to type (similar to #724)