Merge "Remove unused entries from .config-*."