Improve the uninstal part