Clean up redundant function decls/assigns, hide timeout index