CVJ-18
clean up of debug statements