Merge remote-tracking branch 'cloudant/couchdb-2992-remove-dead-code'

Closes #60