Added cleanup_on_startup setting