Remove references to intance and trigger