Remove case class extraction entirely