VOYEUR: Remove some useless variables