We don't need no stinkin non-block form
Remove unused time_hash method
Merge branch 'master' into streaming-results
Refactor service finding SQL
Merge branch 'master' into streaming-results