Move hook normalization to TPCUtil / Fix TPCFormats