More cleanup from previous migration