cleaned up debugging code for release candidate