remove log and add fields