Clean up the protocol draft