removed obsolete discriminators