Mostly removing obsolete classes