Merge branch 'jk/misc-unused-fixes'