More document cleanup