Is this TODO needed for production?