More cleanup of migrations