unnecessary function removed from server module
Merge branch 'develop'