B-ware Clean-up