Re #457: cleanup