Remove application helper duplication