Remove deprecated functionality that has exceeded its grace period.
Merge pull request #492 from square/jw/deprecated

Remove deprecated functionality that has exceeded its grace period.