Revert "Keep util class (support info)"

This reverts commit 14c1b8016a5ea0a640a969398ed0839058fed5cb.