Prabin - added some clean up when reinstalling