ISSUE_20 - Cleanup of server code