removed some Guice Inject annotations usage