removed old, commented code