HintTransform clean up