More clean-up in the helperfiles