removed obsolete class
next version number
simplified code