Removing Guice dependency