Removed deprecated code.
Merge branch 'web'