Remove remaining todos