Removed dynamic services and added Google Guice