removing break and dupe loop