more cleanup for non member save

see #85