removed unused and duplicate method
fixed import issue and removed old/unused code