Remove unnecessary re-throw; happens automatically
Remove hardcoded timeouts.

Only needed in debug builds anyway, at least on my machine.