Removed more useless classes.