Re #1192 cleanup
Re #1193 cleanup