Minor - removing unused code