and more unrelated modifications removed