diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index bc102d47af74..cee5e7406355 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -20,18 +20,6 @@ parameters:
       PythonVersion: '3.5'
       CoverageArg: ''
       RunForPR: false
-    Linux_Python36:
-      OSName: 'Linux'
-      OSVmImage: 'ubuntu-18.04'
-      PythonVersion: '3.6'
-      CoverageArg: ''
-      RunForPR: false
-    Linux_Python37:
-      OSName: 'Linux'
-      OSVmImage: 'ubuntu-18.04'
-      PythonVersion: '3.7'
-      CoverageArg: ''
-      RunForPR: false
     Linux_Python38:
       OSName: 'Linux'
       OSVmImage: 'ubuntu-18.04'
@@ -90,6 +78,7 @@ jobs:
       parameters: 
         ServiceDirectory: ${{ parameters.ServiceDirectory }}
         BuildTargetingString: ${{ parameters.BuildTargetingString }}
+        TestMarkArgument: ${{ parameters.TestMarkArgument }}
 
   - job: 'Test'
     condition: and(succeededOrFailed(), ne(variables['Skip.Test'], 'true'))
@@ -146,44 +135,6 @@ jobs:
               ServiceDirectory: ${{ parameters.ServiceDirectory }}
               BuildTargetingString: ${{ parameters.BuildTargetingString }}
 
-  - job: 'RunMyPy'
-    condition: and(succeededOrFailed(), ne(variables['Skip.MyPy'], 'true'))
-    displayName: 'Run MyPy'
-    variables:
-    - template: ../variables/globals.yml
-
-    dependsOn:
-      - 'Build'
-
-    pool:
-      vmImage: 'ubuntu-18.04'
-
-    steps:
-    - template: ../steps/run_mypy.yml
-      parameters: 
-        ServiceDirectory: ${{ parameters.ServiceDirectory }}
-        BuildTargetingString: ${{ parameters.BuildTargetingString }}
-        TestMarkArgument: ${{ parameters.TestMarkArgument }}
-
-  - job: 'RunPyLint'
-    condition: and(succeededOrFailed(), ne(variables['Skip.Pylint'], 'true'))
-    displayName: 'Run Pylint'
-    variables:
-    - template: ../variables/globals.yml
-
-    dependsOn:
-      - 'Build'
-
-    pool:
-      vmImage: 'ubuntu-18.04'
-
-    steps:
-    - template: ../steps/run_pylint.yml
-      parameters: 
-        ServiceDirectory: ${{ parameters.ServiceDirectory }}
-        BuildTargetingString: ${{ parameters.BuildTargetingString }}
-        TestMarkArgument: ${{ parameters.TestMarkArgument }}
-
   - job: 'RunRegression'
     condition: and(succeededOrFailed(), or(eq(variables['Run.Regression'], 'true'), and(eq(variables['Build.Reason'], 'Schedule'), eq(variables['System.TeamProject'],'internal'))))
     displayName: 'Run Regression'
diff --git a/eng/pipelines/templates/steps/analyze.yml b/eng/pipelines/templates/steps/analyze.yml
index a6b06bc6aef9..c4e56dc0c2d4 100644
--- a/eng/pipelines/templates/steps/analyze.yml
+++ b/eng/pipelines/templates/steps/analyze.yml
@@ -1,6 +1,7 @@
 parameters:
   BuildTargetingString: 'azure-*'
   ServiceDirectory: ''
+  TestMarkArgument: ''
 
 steps:
   - task: UsePythonVersion@0
@@ -69,4 +70,18 @@ steps:
     condition: ne(variables['Skip.VerifyWhl'],'true')
     inputs:
      scriptPath: 'scripts/devops_tasks/setup_execute_tests.py'
-     arguments: '"${{ parameters.BuildTargetingString }}" --service=${{parameters.ServiceDirectory}} --toxenv=verifywhl'
\ No newline at end of file
+     arguments: '"${{ parameters.BuildTargetingString }}" --service=${{parameters.ServiceDirectory}} --toxenv=verifywhl'
+
+  - ${{if ne(variables['Skip.MyPy'], 'true') }}:
+    - template: run_mypy.yml
+      parameters: 
+        ServiceDirectory: ${{ parameters.ServiceDirectory }}
+        BuildTargetingString: ${{ parameters.BuildTargetingString }}
+        TestMarkArgument: ${{ parameters.TestMarkArgument }}
+
+  - ${{if ne(variables['Skip.Pylint'], 'true') }}:
+    - template: run_pylint.yml
+      parameters: 
+        ServiceDirectory: ${{ parameters.ServiceDirectory }}
+        BuildTargetingString: ${{ parameters.BuildTargetingString }}
+        TestMarkArgument: ${{ parameters.TestMarkArgument }}
\ No newline at end of file
diff --git a/sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt b/sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt
index 7b777172dce0..2a41134e0e0d 100644
--- a/sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt
+++ b/sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt
@@ -5,4 +5,3 @@
 aiohttp>=3.0; python_version >= '3.5'
 aiodns>=2.0; python_version >= '3.5'
 msrest>=0.6.10
-