so just replace it with delete and simplify the code
around it now we know exactly what it does

Change-Id: Ie23bc46583684bda35b47022ea9853f25a415b0d