Issue #2416: Delete superfluous code after split module