Fix for 'callback was already called issue': timeout listener was not being removed

Fix for 'callback was already called issue': timeout listener was not being removed