Some minor changes to menu_cleanupgmas to maybe help debug an issue where it "doesnt work sometimes"