Remove unused helper class