BZ-1108472: general cleanup in order to have a clean shutdown on TOMCAT (also removed some Guice Inject annotations usage)