Re #1567: cleanup