Merge "Clean up BBQ#abandon dead code"