Server code cleaned up, updated build number