modified all
removed an unsued variable