-. modify logging message and remove obsoleted code