Couch cleanup

REQUIRES PREINDEX

read commit by commit (first is just formatting, second is substantive)

Actually really just read the second commit