removed obsolete runtime code
merge conflict