Cleaned PUBLIC_FIELDS and related.