Remove old references to custom type