Cleaner 1.6.x checks.