cleanup after merge back to master, bb store fixes