Remove some cruft.
More cleanup and better naming.