Removed some now unnecessary code.