Code cleanup in Debug.exe