Removed more unused imports and unused fields