Fixed uninstall routines