Tweaked basic cleaner check