A little clean up and cruft removal.