Clean up last of old saving code