Removing TODO comment as per Michael's request.