Merge "Some clean up for mark sweep files"