cleaning up some of the todos that have been resolved already