Crm 15619, api break and cleanup fixes