More annotation and guice cleanup.