remove some todo and other clean up