Updating per review on undefined cleanup