Add Upgrade Notice. Cleanup.