Ix 9.13.0 remove unnecessary classes