Try skipping cleanup