remove references to obsolete methods
Merge branch 'master' of github.com:petkaantonov/bluebird