move some lines to jw_cleanup