Removing some obsolete classes