gitignore
Update custom_fields to use the new approach as well.
Clear state in case of profile change.