Removed some useless classes