Cleanup

Garbage removed, dep.Gui.Wizard added.