rename some fields
remove unneeded images