Removed unused imports and obsolete comments