cleaner script

Change-Id: I74e5d0618739d55553d18056aabcdf15b1755630