Update def cleanup()