Removed dead TODOs based on conclusions regarding caching .save data