Remove unnecessary save calls