REBASE: Remove web subsystem

Replaces #4810 following a rebase / conflict resolution exercise.