Cleanup and add BBDB configuration