Remove all but jf and d2