Removed unneeded wire.
Removed more cruft.