Cleanup of FaviconUtil (simplified code)