WIP: Uninstalling Improvements
WIP: Uninstalling