re #3 Cleanup.