remove subclass and reorganize