Cleanup message and map packages