NP-3178: playing with guard on clean method