Remove duplicated architecture filtering
