Vishal #0 removing unused code