Clean bb ext up

Reduce the amount of code to be maintained (not that this particular code required that much maintenance).