Remove unneeded struct member and fix references to it