Removed old comprehension code