Merge branch 'jk/unused'