removed unneeded imports and fields