Grr- that final cleanup did not work so well

Change-Id: I4f05b7e73f5846cd240a9d762280f0bf2147f0c0