Remove 'superfluous' timeout code.
Merge pull request #47 from Metaswitch/rm_superfluous_timeout_code

Reviewer MIRW - Remove 'superfluous' timeout code.