Remove subclass implementation and redefine as a category