Remove server
Merge branch 'dev'