Merge branch 'jk/rm-removed-paths'