Updating comments - removing unused code