Removed filter and withFilter from future and removed tuples in for
comprehensions