re #44 - Cleanup