Removed Unused Fields