remove some TODO