Remove debug code and commented out code that was left in.