Removed warnings, unused imports.