Removed unnecessary code
Cleaning up