More mapping, and remove some useless fields

Not all fields could be removed for some reason ...