MDL-42078 implement return after uninstall and cleanup uninstall