clean up redundant db save calls