Fix last cleanup.