VOYEUR: More cleanup