Imports cleanup. Deprecate non akka code