Remove unused helper functions