Remove unneeded struct