Removed unecessary structure usages and definition