Merge branch 'cb/remove-dead-init'