Hotfix/removed unnecessary or