Removed akka dependency where not needed