Some more cleanup with jk2 folder.