Remove cruft.
Complete unit test.