Remove dead code.
Format documents to use new hash syntax.
Remove duplication.