Minor cleanup
Migrate back to http-kit for client