cleanup: Remove some unused defines.
Fix GUI bug where scav button pretends to be clickable even when not the host.
Merge branch 'bugfixes' into 3.1