Remove filter on nonEmpty Seq as it is not needed