Removed unused imports and declarations