Removed some unused imports and corrected usage.