removing unused function
changing the location of line