final cleanup post upgrade