clean up (CRM-12463)

cleaning up BAO