clean up more stains

Change-Id: I9e406f11be28596dbbbc05c24f1c615255d828dd