Simplify maybe-disabling-toolbars
Remove terrible Cygwin logout hack

Not necessary anymore? Dunno what changed.