Midway odm clean

| Q                   | A
| ------------------- | ---
| Bug fix?            | No
| New feature?        | No
| BC breaks?          | No
| Tests pass?         | Yes
| Scenarios pass?     | WIP
| Checkstyle issues?  | No
| Changelog updated?  | N.A.
| Fixed tickets       | N.A.
| Doc PR              | N.A.