Cleaned up guice singletons