Is this TODO still valid?