Add a bunch of logging
Remove stray versus code

Has no effect on the code, not used anywhere.