Clean up, going to delete bb_syncrhonizer soon