Cleanup framing mechanisms

No match.