trim back some changes