am 35586c6f: Merge "Some clean up for mark sweep files"

* commit '35586c6f1e57b61fdd7f0b63a8f1bc5a7a4f9af6':
  Some clean up for mark sweep files