removed old, unused code