remove some anonymous classes