removed warnings and unused imports