Updates some documentation to use `expect` syntax
Removes deprecated feature

* master branch is now 3.0