Remove unnecessary cleaning
Remove unnecessary cleaning from save methods