Minor layer-wights cleanup