Remove usage of jQuery and use helper instead