Updated akka to 2.3.3 and did some code cleaning