removed unused imports, renamed function shadowing import