second pard of cleanup