Deprecated APIs replaced and code clean up

[offa]

Replaces deprecated APIs and some additional clean up.

---

• Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
• Ensure that the pull request title represents the desired changelog entry
• Please describe what you did
• Link to relevant issues in GitHub or Jira
• Link to relevant pull requests, esp. upstream and downstream changes
• Ensure you have provided tests - that demonstrates feature works or fixes the issue

[offa]

ping @olamy

[olamy]

@offa sorry for late reply. I will merge it but there is a conflict to resolve.

[offa]

Thanks for the fast reply, I'll resolve it … :-)

[offa]

CI has some download issues, but conflicts are resolved.