Removed some unecessary extra code.