(bug 43292) removing references is working now

Change-Id: I08765144f3110a4feab789b1906a34989be0adea
Merge "(bug 43292) removing references is working now"