Remove test override, clean up other stale config.