Remove unnecessary subclasses