Remove use of bnodes