remove akka stuff and reformat to maybe get this in mainline