Remove property when case class has None