Debugging lines completely removed

Many of the changes in the last two commits were removing debugging code
as well as the tweaks to get the problem solved