remove some todo items after fixing codes