remove some logs and comments