Removed some unneeded junk.