Remove dependency on helper-functions.js