I have removed the extra piece of code in patch #2, Please review.