Remove old code ch 7