Remove diagnostic ifdef.
Remove commented out cout.
Remove commented out printf.
Remove another commented out printf.
Merge branch 'reverse_cleanup'