Fixup cleanup

Change-Id: I47af3ad7af1c7f6dc53dfbda221bc04b8f24ccd4