Delete this TODO now?