diff --git a/appveyor.yml b/appveyor.yml
index cf6a33a2d..6998a1c5e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,6 +10,7 @@ after_build:
   - IF DEFINED keystore_password msbuild "/t:SignAndroidPackage" "/p:Configuration=Release" "/p:AndroidKeyStore=true" "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=%keystore_password%" "/p:AndroidSigningKeyStore=8bit.keystore" "/p:AndroidSigningStorePass=%keystore_password%" "src\Android\Android.csproj"
   - ps: IF($env:keystore_dec_secret) { copy-item src\Android\bin\Release\com.x8bit.bitwarden-Signed.apk .\com.x8bit.bitwarden-$($env:APPVEYOR_BUILD_NUMBER).apk }
   - ps: IF($env:keystore_dec_secret) { .\src\Android\fdroid-remove-libs.ps1 $($env:APPVEYOR_BUILD_FOLDER) }
+  - IF DEFINED keystore_password msbuild "C:\projects\mobile\bitwarden-mobile.sln" "/t:Clean"
   - IF DEFINED keystore_password msbuild "C:\projects\mobile\bitwarden-mobile.sln" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" "/p:Configuration=FDroid"
   - IF DEFINED keystore_password msbuild "/t:SignAndroidPackage" "/p:Configuration=FDroid" "/p:AndroidKeyStore=true" "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=%keystore_password%" "/p:AndroidSigningKeyStore=8bit.keystore" "/p:AndroidSigningStorePass=%keystore_password%" "src\Android\Android.csproj"
   - ps: IF($env:keystore_dec_secret) { copy-item src\Android\bin\FDroid\com.x8bit.bitwarden-Signed.apk .\com.x8bit.bitwarden-fdroid-$($env:APPVEYOR_BUILD_NUMBER).apk }
diff --git a/src/Android/fdroid-remove-libs.ps1 b/src/Android/fdroid-remove-libs.ps1
index 40d496392..03f0048ed 100644
--- a/src/Android/fdroid-remove-libs.ps1
+++ b/src/Android/fdroid-remove-libs.ps1
@@ -34,25 +34,3 @@ $hockeyNode.ParentNode.RemoveChild($hockeyNode);
 
 $xml.Save($appPath);
 
-# Clean project directories
-
-$androidBinDir = $($rootPath + "\src\Android\bin");
-$androidObjDir = $($rootPath + "\src\Android\obj");
-$appBinDir = $($rootPath + "\src\App\bin");
-$appObjDir = $($rootPath + "\src\App\obj");
-
-if((Test-Path -Path $androidBinDir)) {
-    Remove-Item -Recurse -Force $androidBinDir;
-}
-
-if((Test-Path -Path $androidObjDir)) {
-    Remove-Item -Recurse -Force $androidObjDir;
-}
-
-if((Test-Path -Path $appBinDir)) {
-    Remove-Item -Recurse -Force $appBinDir;
-}
-
-if((Test-Path -Path $appObjDir)) {
-    Remove-Item -Recurse -Force $appObjDir;
-}