#42: RC1 cleanup - speed