Removed warnings and unused imports