cleanup guice

do injection in Guice-style, by using  the `@javax.inject.Inject`   instead creating a custom annotation