removed unused import and duplicate method