Removed redundant struct