removed old dead code