Upgrade reactionary for cleanup / removal of unused 'class' feature