removed old/unused code