Further clean up on Hard Mode. Again, not a perfect run, but a solid starting point.