Stop using reflection, and preliminary work for setup mode