NEW_GEN: removed erroneous import of removed classes.