remove commented code following code review.