Removing convert to subclass method