2949201 cleanup