More cleanup, remove old CONTROLS dialog info.
Merge pull request #2987 from thedax/win32UICleanup

Win32 UI: More cleanups.