Utilities cleanup (21/27)

Utilities cleanup