Merge branch 'sb/misc-cleanup'