re #782 - Clean-up