1.1 Some minor changes in the uninstall function