Remove validated event, and Add complete event for validator