Remove timeout and use event instead