Cleaning up the save mechanisms.