Clean up the cleanup code

Change-Id: Ie07cb1d66d9ed99464fa6854c47cb33fe86ddaa6
1 file changed