cleanup

remove some unused functions