Utilities cleanup (1/27)

Utilities cleanup