Some cleanup from past commits including removing a debugger statement that got left.