re #562: clean-up