removed harmful __class__