remove cleanup_interval field