Removed some obsolete classes #8