More things to remove. Shuffled some lines around