GUI mode cleanup