Sam is adding todos around possibly broken or unnecessary code. Go through them and see what can be removed.