Removed broken servlet mapping and updated drop tables