Removing some ugly debug code