remaining dagger/otto refactoring