Ditch unused  case class