Remove unused code
More tests and coverage
Cleanup and coverage