Issue #1926250 by pmagunia: Deletes variables used by module upon uninstall. Cleanup of variable names.