Code cleanup

Removed code that used bb instead of xbs