cleanup of obsolete classes