Remove unnecessary saves