removing unused code/parameters