More removal of embedded superuser