cleanup around bnodes