remove cruft.
Restructure.