Remove non-Mopa compatibility layer when Mopa is actually installed.
Merge pull request #2155 from Richtermeister/improve-mopa-compat

Remove non-Mopa compatibility layer when Mopa is actually installed.