Clean up redundant function decls/assigns, hide timeout index
Merge pull request #1 from rschaosid/patch-1

Clean up redundant function decls/assigns, hide timeout index