CRM-15578 - Cleanup & basic AB testing