WIP: HTTP renderer cleanup (I)