Code cleaning, optimizing imports, Akka v. changed to 2.3.5.