More dep cleanup.
Finish removing underscore.