Added second pass of clean sweep. We can cherry pick from each and arrive at a final version.