diff --git a/.ci/install.yml b/.ci/install.yml
deleted file mode 100644
index 7a27e37c6..000000000
--- a/.ci/install.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-steps:
-  - script: |
-      choco install -y llvm
-    displayName: Windows Install LLVM
-    condition: eq( variables['Agent.OS'], 'Windows_NT' )
-  - script: |
-      sudo apt-get update -yqq
-      sudo apt-get install -yqq --no-install-recommends libclang-dev clang
-    displayName: Linux Install Dependencies
-    condition: eq( variables['Agent.OS'], 'Linux' )
-  - script: |
-      brew uninstall llvm
-    displayName: macOS Uninstall LLVM
-    condition: eq( variables['Agent.OS'], 'Darwin' )
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 71c6f9e72..1c6f379cc 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -30,7 +30,7 @@ variables:
 jobs:
 - job: linux
   pool:
-    vmImage: ubuntu-16.04
+    vmImage: ubuntu-latest
   strategy:
     matrix:
       config/libwallet/api:
@@ -46,12 +46,11 @@ jobs:
         CI_JOB: release
         PLATFORM: linux-amd64
   steps:
-    - template: '.ci/install.yml'
     - template: '.ci/test.yml'
     - template: '.ci/release.yml'
 - job: macos
   pool:
-    vmImage: macos-10.14
+    vmImage: macos-latest
   strategy:
     matrix:
       test:
@@ -60,12 +59,14 @@ jobs:
         CI_JOB: release
         PLATFORM: macos
   steps:
-    - template: '.ci/install.yml'
+    - script: |
+        brew uninstall llvm
+      displayName: macOS Uninstall LLVM
     - template: '.ci/test.yml'
     - template: '.ci/release.yml'
 - job: windows
   pool:
-    vmImage: windows-2019
+    vmImage: windows-latest
   strategy:
     matrix:
       test:
@@ -74,6 +75,8 @@ jobs:
         CI_JOB: release
         PLATFORM: win-x64
   steps:
-    - template: '.ci/install.yml'
+    - script: |
+        choco install -y llvm
+      displayName: Windows Install LLVM
     - template: '.ci/test.yml'
     - template: '.ci/windows-release.yml'