removed obsolete class
updated schema annotations