removing -snapshot and todos