Removed some uneeded code.