Remove some unnecessary debug code from solution for #4