Some clean-up in-between session 2 & 3.