re #878 - Cleanup