More Upgrade hints
Removed unused variable