#1382: cleanup