Removed some unnecessary code.