Cleanup and complete coverage

Removed old, orphaned code.
Acheived 100% coverage for header and cpp files.