Preparation for Injection

Removed unused dependencies, added Google Guice for future dependency
implementaion.