cleanup - todo removal