clean up debugging code
remove commented out code