Cleaned of bogus classes