Minor updates, remove some stale migrations