[Utils] Clean up.