Remove complete event and prevent "isRunning" flag race condition