Cleanup of dependencies.
Removed some unnecessary dependencies and tightened up a couple of
other dependencies.