remove hack of GongXin