remove some logs, code cleanup