Remove setTimeout workaround