Code cleanup

Left some debugging code in there.