Removed vals from case class