cleanup
remove some todos