Removing the old classes that are no longer used.
Removing old useless tests.
Shoring up some tests and doing some minimal in the field tests.