Remove fields
Merge changes