Merge branch 'bh-remove'