Remove overdue deprecated modules

[See PT #56795804]
[See PT #56796034]
Land #2531 - rm deprecated mods