Small code update removing unused code.