removing commented code
server tweaking
Merge branch 'develop'

* develop:
  server tweaking
  removing commented code