Update for _.cleanup