Better implementation of NICK cleaning