remove more anonymous classes