Fixing add/remove documents. There seems to still be some fishy stuff there.