Updated  swagger version (deleted scala dependency, and some code changes)