removed old, commented out code