get rid of obsoleted class