Actually, that's probably better in it's own addon
Remove from bbextra