HCSVLAB-568: Added a tidy-up section