Des: removed legacy code, updated web.xml, tested and deployed