Clean up the newest changes.
Merge remote-tracking branch 'ospalh/flake' into ospalh-special
Quick hack to cancel the upgrade wizard.