Remove static dependeces and using Guice for wiring