NH-3658 (fixed)

Cleanup with tests passing.