Remove timeout from listeners
0.6.3