Cleanup to pave the way towards ProtocolV2