removing unused code..