challenges: some more user cleanup in migration