First round of cleanup codec-http2