Updated the cleanup tasks