remove old debug code
cleanup whitespace
3.7.1