Removed unused variable
Removed no longer needed timeout
Merge pull request #254 from saghul/fixup

A couple of small fixes removing unneeded variables