Remove some of unnecessary arguments
Few more fixes
Fixed remaining issues
Hack fix
Merge pull request #265 from korczis/rest-merge

Remove some of unnecessary arguments