Adding ability to uninstall