removed obsolete generic types