Removed lots of useless BNU stuff