Remove todo
Update todo
Change dependency on class name to dependency on instance