Use `Builder` and `Watcher` models, not old utility functions.
Merge pull request #864 from rjackson/remove-unused-utilities

Use `Builder` and `Watcher` models, not old utility functions.