Re #1457 - cleanup