fix mappings and remove messages.