removed 2 fields