Removed junk web.xml
Some alterations to fix serialization problems