Removed cruft.
Moved code to be restored.