Cleanup -- shameful snatch and grab from Stefans good work: