Remove additional sort context watch