Remove fireEvents improvements