Merge branch 'jc/unused-symbols'