Remove Duplicate / Repeated Code

Hi

Please update these are changes. I have attached already patch file.

Finally you close this ticket

Thanks