Removing obsolete classes