Merge "Remove unused RFCViolation"