Remove last traces of the old 'subclass' feature