Refactored uninstall