Completely removed Guice and started Spring implementation