Changed the uninstall to be more consistent