Removing atavistic todo's