Remove state leakage from resource instances