Improved user-data uninstall routines