Merge branch 'couchdb-3284-remove-dead-code'

Closes #225