Removed unused statements, Attached interdiff for same. please review.