Uninstal improvements