more jd cleanup