Some useless classes are removed