clean up some todo tasks