Some cleanup and a non-functional auto-start switch...