CLOSED: Xunlai cleanup