Remove some logic from a Danish function