Added some debug lines in server
Updated clientId and cleanup