Issue #2095829 by bdone,mikeryan: Remove all variables on uninstall