removed obsolete definitions