War entity cleanup and consolidation
Memorial Site entity cleanup and consolidation