Removed unused imports
Updated according to class changes