Removed some obsolete classes