Remove extraneous debugger statement
Improvements to one-shot upgrade UI