remove logger calls
correct comment count
bix BO bug