d2/jf: consolidate everything

Change-Id: I19cbbaa9bb4b8c8c2bd58ec5fd760b4b84fcecd1