Clean up remaining violations in auto generated files