Removed unnecessary code!