clean up post-Hijack code

[jmhodges]

We should rename hijackHandle and fix up the logging in it to include the new name. Or refactor the JSON API and HTML handlers to not use a central func anymore since the new code needs much less handholding