removed unused imports and fields

CC @munificent