Added more uninstall steps