Remove arguments as they can be passed in the closure