Remove use of subclasses