Update to remove BB stuff