Removed some unneeded code.