remove not needed code and add some room logs on server side