Removed the TODO that corresponds to the save bug