rm some debug code; it still leaves entries that were modified by upgrade scripts...