removed Guice/Governator stuff for now...