Removed unnecessary saves