On-going patch tidy-up