removed old code ch10