removing duplicate fields

and other minor corrections