Removed unnecessary imports and fields