Remove more spx related classes.