Continued tidy-up.