Clean up unnecessary fields