Remove extra TYPE's