now removing unused code