web: removed old code
merge conflicts