SPDY: code cleanup