feat: #3575201 Simple deprecation removal from modules part 1

Closes #3575201

Merge request reports

Loading