Removed old code ch 6