Fix the build. Nats now retries connecting ad infitium
Woops run all tests again!
Cleanup unused code, etc.