cleanup and make akka-actor a bundle