misc clean up
removed some outdated functions