Removed some legacy junk. More unit tests.