Remove unnecessary helper class