cleanup Jake and DH

now should be on the same state.