re #787 - Cleanup