Remove unneeded struct and related methods