Clean up some details with CouchMaster