Removed Unnecessary code