Clean ups for loop deletion based on Chris' feedback.