remove new_subclass calls