cleanup bb2diaspora - was getting crufty