Utilities cleanup