Some cleanup from downstream