DER-128 - Eliminate deprecated swaps elements in DER

[ElisaKendall]

Signed-off-by: Elisa Kendall ekendall@thematix.com

Description

Eliminated deprecated swap elements to clean things up

Fixes: #1777 / DER-128

Checklist:

• [x] I'm familiar with the FIBO developer quide. My contribution meets all the requirements described there.
• [x] My contribution follows the principles of best practices for FIBO.
• [x] My changes have been reconciled with latest master and no merge conflicts remain.
• [x] This PR is related to exactly one issue. The issue is referenced by using a GitHub keyword such as "fixes", "closes", or "resolves".
• [x] Hygiene tests have been applied by a PR with "(WIP)" in title.
• [x] The issue has been tested locally using a reasoner (for ontology changes).