VID-1568 Cleaner conditional per @garthwebb