[Core/Logon:] Cleanup for Main.cpp