Save point.  Cleaning up cruft