remove jay, close #22