CRM-12463 (BAO cleanup)

CRM-12463 (BAO cleanup)