Clean catalog models

| Q                    | A
| -------------------- | ---
| Bug fix?             | N
| New feature?         | N
| BC breaks?           | N
| CI currently passes? | Y
| Tests pass?          |  Y
| Scenarios pass?      |  Y !
| Checkstyle issues?*  | N
| PMD issues?**        | N
| Changelog updated?   | Y
| Fixed tickets        | -
| DB schema updated?   | -
| Migration script?    | -
| Doc PR               | -