Merge pull request #2977 from thedax/win32UICleanup

Win32 UI: Major code cleanups.
More cleanup, remove old CONTROLS dialog info.