clean up
Merge branch 'bh4'

why do i need to add a comment