Can this TODO be removed now?