Moving away from Otto-based prerendering, general cleanups