Issue #2322245: Remove dead code
Issue #2322245: Sync name fields to subsites