Remove unnecessary custom complete event checker