Remove 'running' check - it's not reliable