clean up stains

rebase
Change-Id: I11f4439802884acb761bc291d28dc81520e8f441