When to remove goodwill?

Schweser suggests (Book 3 p291) to remove goodwill in a financial statement analysis item set, but keep goodwill on residual income model question. What if they crossover the two on the exam?? =p