Refactored to remove references to removed subclasses