Removed unused code
Defect fixed