Further cleanup of the runtime views