remove debugging junk
add logging output