More Gui and Gui cleanup.