Merge branch 'ar/t4150-remove-cruft'