Remove some red-herring debugging code and add some prints