Added code for uninstall functionality