Remove more stray keys. Add logging to debug log keys removal.