(chore): Cleanup duplicates#352

Parsa307 wants to merge 14 commits intoMasterKia:mainMasterKia/PersianBlocker:mainfrom

Parsa307:cleanup-duplicatesParsa307/PersianBlocker:cleanup-duplicatesCopy head branch name to clipboard