cleaned up some TODOs that were already completed