bb cleanup

Change-Id: I3d9b7ff3b7885bd70b63af7d5b4f8fab5789314e