Clean up util namespace, remove unused functions