cleanup guice refactoring