remove deprecation warnings
Merge pull request #472 from twitter/jco/remove_dep

Remove deprecation indirections