Removing some accidental debug code remnants