Cleanup ignores, etc.