Cleanup and add more uninstall steps