catching Timout exceptions and removed commented code
Fixed merge issues