Remove Dependency.get usage, warnings, and dead code

Fixes: 218352029
Test: ran all tests
Change-Id: I6d8b3c0066e64ca63406a2829d19bee0af203d18
2 files changed