Remove unused messages
Update maps to latest data