cleaning TODO's