Removed unneeded struct