diff --git a/src/cpp/ripple/FieldNames.cpp b/src/cpp/ripple/FieldNames.cpp
index 2789f33aba..d51adf8ad0 100644
--- a/src/cpp/ripple/FieldNames.cpp
+++ b/src/cpp/ripple/FieldNames.cpp
@@ -30,27 +30,6 @@ static int initFields()
 {
 	sfTxnSignature.notSigningField();		sfTxnSignatures.notSigningField();
 	sfSignature.notSigningField();
-
-	sfHighQualityIn.setMeta(SFM_CHANGE);	sfHighQualityOut.setMeta(SFM_CHANGE);
-	sfLowQualityIn.setMeta(SFM_CHANGE);		sfLowQualityOut.setMeta(SFM_CHANGE);
-
-	sfLowLimit.setMeta(SFM_ALWAYS);			sfHighLimit.setMeta(SFM_ALWAYS);
-	sfTakerPays.setMeta(SFM_ALWAYS);		sfTakerGets.setMeta(SFM_ALWAYS);
-	sfQualityIn.setMeta(SFM_ALWAYS);		sfQualityOut.setMeta(SFM_ALWAYS);
-
-	sfBalance.setMeta(SFM_ALWAYS);
-
-	sfPublicKey.setMeta(SFM_CHANGE);		sfMessageKey.setMeta(SFM_CHANGE);
-	sfSigningPubKey.setMeta(SFM_CHANGE);	sfAuthorizedKey.setMeta(SFM_CHANGE);
-	sfSigningAccounts.setMeta(SFM_CHANGE);
-
-	sfWalletLocator.setMeta(SFM_ALWAYS);
-	sfWalletSize.setMeta(SFM_ALWAYS);
-	sfNickname.setMeta(SFM_CHANGE);
-	sfAmount.setMeta(SFM_ALWAYS);
-	sfDomain.setMeta(SFM_CHANGE);
-	sfOwner.setMeta(SFM_ALWAYS);
-
 	return 0;
 }
 static const int f = initFields();
@@ -60,6 +39,7 @@ SField::SField(SerializedTypeID tid, int fv) : fieldCode(FIELD_CODE(tid, fv)), f
 { // call with the map mutex
 	fieldName = lexical_cast_i(tid) + "/" + lexical_cast_i(fv);
 	codeToField[fieldCode] = this;
+	assert((fv != 1) || ((tid != STI_ARRAY) && (tid!=STI_OBJECT)));
 }
 
 SField::ref SField::getField(int code)
diff --git a/src/cpp/ripple/FieldNames.h b/src/cpp/ripple/FieldNames.h
index 3a0ae9a3a1..8b1d5636a5 100644
--- a/src/cpp/ripple/FieldNames.h
+++ b/src/cpp/ripple/FieldNames.h
@@ -33,14 +33,6 @@ enum SOE_Flags
 	SOE_OPTIONAL = 1,	// optional
 };
 
-enum SF_Meta
-{
-	SFM_NEVER	= 0,
-	SFM_CHANGE	= 1,
-	SFM_DELETE	= 2,
-	SFM_ALWAYS	= 3
-};
-
 class SField
 {
 public:
@@ -59,19 +51,17 @@ public:
 	const SerializedTypeID	fieldType;		// STI_*
 	const int				fieldValue;		// Code number for protocol
 	std::string				fieldName;
-	SF_Meta					fieldMeta;
 	bool					signingField;
 
 	SField(int fc, SerializedTypeID tid, int fv, const char* fn) : 
-		fieldCode(fc), fieldType(tid), fieldValue(fv), fieldName(fn), fieldMeta(SFM_NEVER), signingField(true)
+		fieldCode(fc), fieldType(tid), fieldValue(fv), fieldName(fn), signingField(true)
 	{
 		boost::mutex::scoped_lock sl(mapMutex);
 		codeToField[fieldCode] = this;
 	}
 
 	SField(SerializedTypeID tid, int fv, const char *fn) :
-		fieldCode(FIELD_CODE(tid, fv)), fieldType(tid), fieldValue(fv), fieldName(fn),
-		fieldMeta(SFM_NEVER), signingField(true)
+		fieldCode(FIELD_CODE(tid, fv)), fieldType(tid), fieldValue(fv), fieldName(fn), signingField(true)
 	{
 		boost::mutex::scoped_lock sl(mapMutex);
 		codeToField[fieldCode] = this;
@@ -95,10 +85,6 @@ public:
 	bool isBinary() const		{ return fieldValue < 256; }
 	bool isDiscardable() const	{ return fieldValue > 256; }
 
-	SF_Meta getMeta() const		{ return fieldMeta; }
-	bool shouldMetaDel() const	{ return (fieldMeta == SFM_DELETE) || (fieldMeta == SFM_ALWAYS); }
-	bool shouldMetaMod() const	{ return (fieldMeta == SFM_CHANGE) || (fieldMeta == SFM_ALWAYS); }
-	void setMeta(SF_Meta m)		{ fieldMeta = m; }
 	bool isSigningField() const	{ return signingField; }
 	void notSigningField()		{ signingField = false; }