Removed dead code as per code review.