Removing self as a closure variable