Fix minor bugs
Remove obsolete usage of config
Merge branch 'refactor_rest' into develop