VOYEUR: Clean up of some of the startup code