diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj.bak b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj.bak
deleted file mode 100644
index 9b2619bc9..000000000
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj.bak
+++ /dev/null
@@ -1,322 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{67F9D3A8-F71E-4428-913F-C37AE82CDB24}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>eShopOnContainers.Core</RootNamespace>
-    <AssemblyName>eShopOnContainers.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Animations\Base\AnimationBase.cs" />
-    <Compile Include="Animations\Base\EasingType.cs" />
-    <Compile Include="Animations\FadeToAnimation.cs" />
-    <Compile Include="Animations\StoryBoard.cs" />
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Behaviors\Base\BindableBehavior.cs" />
-    <Compile Include="Behaviors\EventToCommandBehavior.cs" />
-    <Compile Include="Controls\AddBasketButton.xaml.cs">
-      <DependentUpon>AddBasketButton.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\CustomTabbedPage.cs" />
-    <Compile Include="Controls\ToggleButton.cs" />
-    <Compile Include="Converters\DoubleConverter.cs" />
-    <Compile Include="Converters\StringNullOrEmptyBoolConverter.cs" />
-    <Compile Include="Converters\CountToBoolConverter.cs" />
-    <Compile Include="Converters\DatetimeConverter.cs" />
-    <Compile Include="Converters\ImageConverter.cs" />
-    <Compile Include="Converters\InverseBoolConverter.cs" />
-    <Compile Include="Converters\InverseCountToBoolConverter.cs" />
-    <Compile Include="Converters\ItemsToHeightConverter.cs" />
-    <Compile Include="Converters\ItemTappedEventArgsConverter.cs" />
-    <Compile Include="Converters\ToUpperConverter.cs" />
-    <Compile Include="Converters\WebNavigatedEventArgsConverter.cs" />
-    <Compile Include="Exceptions\ServiceAuthenticationException.cs" />
-    <Compile Include="Extensions\ObservableExtension.cs" />
-    <Compile Include="GlobalSettings.cs" />
-    <Compile Include="Helpers\EasingHelper.cs" />
-    <Compile Include="Helpers\RandomNumberGenerator.cs" />
-    <Compile Include="Helpers\ServicesHelper.cs" />
-    <Compile Include="Helpers\Settings.cs" />
-    <Compile Include="Models\Basket\BasketCheckout.cs" />
-    <Compile Include="Models\Basket\BasketItem.cs" />
-    <Compile Include="Models\Basket\CustomerBasket.cs" />
-    <Compile Include="Models\Catalog\CatalogBrand.cs" />
-    <Compile Include="Models\Catalog\CatalogItem.cs" />
-    <Compile Include="Models\Catalog\CatalogRoot.cs" />
-    <Compile Include="Models\Catalog\CatalogType.cs" />
-    <Compile Include="Models\Location\Location.cs" />
-    <Compile Include="Models\Marketing\CampaignItem.cs" />
-    <Compile Include="Models\Marketing\CampaignRoot.cs" />
-    <Compile Include="Models\Navigation\TabParameter.cs" />
-    <Compile Include="Models\Orders\CancelOrderCommand.cs" />
-    <Compile Include="Models\Orders\CardType.CS" />
-    <Compile Include="Models\Orders\Order.cs" />
-    <Compile Include="Models\Orders\OrderItem.cs" />
-    <Compile Include="Models\Orders\OrderStatus.cs" />
-    <Compile Include="Models\User\Address.cs" />
-    <Compile Include="Models\User\LogoutParameter.cs" />
-    <Compile Include="Models\User\PaymentInfo.cs" />
-    <Compile Include="Models\User\UserInfo.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\Basket\BasketMockService.cs" />
-    <Compile Include="Services\Basket\BasketService.cs" />
-    <Compile Include="Services\Basket\IBasketService.cs" />
-    <Compile Include="Services\Catalog\CatalogMockService.cs" />
-    <Compile Include="Services\Catalog\CatalogService.cs" />
-    <Compile Include="Services\Catalog\ICatalogService.cs" />
-    <Compile Include="Services\Common\Common.cs" />
-    <Compile Include="Services\Dialog\DialogService.cs" />
-    <Compile Include="Services\Dialog\IDialogService.cs" />
-    <Compile Include="Services\Identity\IdentityService.cs" />
-    <Compile Include="Services\Identity\IIdentityService.cs" />
-    <Compile Include="Services\Location\ILocationService.cs" />
-    <Compile Include="Services\Location\LocationService.cs" />
-    <Compile Include="Services\Marketing\ICampaignService.cs" />
-    <Compile Include="Services\Marketing\CampaignMockService.cs" />
-    <Compile Include="Services\Marketing\CampaignService.cs" />
-    <Compile Include="Services\Navigation\INavigationService.cs" />
-    <Compile Include="Services\Navigation\NavigationService.cs" />
-    <Compile Include="Services\OpenUrl\IOpenUrlService.cs" />
-    <Compile Include="Services\OpenUrl\OpenUrlService.cs" />
-    <Compile Include="Services\Order\IOrderService.cs" />
-    <Compile Include="Services\Order\OrderMockService.cs" />
-    <Compile Include="Services\Order\OrderService.cs" />
-    <Compile Include="Services\RequestProvider\HttpRequestExceptionEx.cs" />
-    <Compile Include="Services\RequestProvider\IRequestProvider.cs" />
-    <Compile Include="Services\RequestProvider\RequestProvider.cs" />
-    <Compile Include="Services\User\IUserService.cs" />
-    <Compile Include="Services\User\UserMockService.cs" />
-    <Compile Include="Services\User\UserService.cs" />
-    <Compile Include="Triggers\BeginAnimation.cs" />
-    <Compile Include="Validations\IsNotNullOrEmptyRule.cs" />
-    <Compile Include="Validations\IValidationRule.cs" />
-    <Compile Include="Validations\IValidity.cs" />
-    <Compile Include="Validations\ValidatableObject.cs" />
-    <Compile Include="ViewModels\Base\ExtendedBindableObject.cs" />
-    <Compile Include="ViewModels\Base\MessageKeys.cs" />
-    <Compile Include="ViewModels\Base\ViewModelBase.cs" />
-    <Compile Include="ViewModels\Base\ViewModelLocator.cs" />
-    <Compile Include="ViewModels\BasketViewModel.cs" />
-    <Compile Include="ViewModels\CampaignDetailsViewModel.cs" />
-    <Compile Include="ViewModels\CampaignViewModel.cs" />
-    <Compile Include="ViewModels\CatalogViewModel.cs" />
-    <Compile Include="ViewModels\CheckoutViewModel.cs" />
-    <Compile Include="ViewModels\LoginViewModel.cs" />
-    <Compile Include="ViewModels\MainViewModel.cs" />
-    <Compile Include="ViewModels\OrderDetailViewModel.cs" />
-    <Compile Include="ViewModels\ProfileViewModel.cs" />
-    <Compile Include="ViewModels\SettingsViewModel.cs" />
-    <Compile Include="Views\BasketView.xaml.cs">
-      <DependentUpon>BasketView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CampaignView.xaml.cs">
-      <DependentUpon>CampaignView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CatalogView.xaml.cs">
-      <DependentUpon>CatalogView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CampaignDetailsView.xaml.cs">
-      <DependentUpon>CampaignDetailsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CheckoutView.xaml.cs">
-      <DependentUpon>CheckoutView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CustomNavigationView.xaml.cs">
-      <DependentUpon>CustomNavigationView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\FiltersView.xaml.cs">
-      <DependentUpon>FiltersView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\LoginView.xaml.cs">
-      <DependentUpon>LoginView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\MainView.xaml.cs">
-      <DependentUpon>MainView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\OrderDetailView.xaml.cs">
-      <DependentUpon>OrderDetailView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ProfileView.xaml.cs">
-      <DependentUpon>ProfileView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\SettingsView.xaml.cs">
-      <DependentUpon>SettingsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Templates\BasketItemTemplate.xaml.cs">
-      <DependentUpon>BasketItemTemplate.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Templates\OrderItemTemplate.xaml.cs">
-      <DependentUpon>OrderItemTemplate.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Templates\OrderTemplate.xaml.cs">
-      <DependentUpon>OrderTemplate.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Templates\CampaignTemplate.xaml.cs">
-      <DependentUpon>CampaignTemplate.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Templates\ProductTemplate.xaml.cs">
-      <DependentUpon>ProductTemplate.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Converters\WebNavigatingEventArgsConverter.cs" />
-    <Compile Include="Converters\FirstValidationErrorConverter.cs" />
-    <Compile Include="Effects\EntryLineColorEffect.cs" />
-    <Compile Include="Behaviors\LineColorBehavior.cs" />
-    <Compile Include="Models\Token\UserToken.cs" />
-    <Compile Include="Effects\ThemeEffects.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Controls\AddBasketButton.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\Templates\BasketItemTemplate.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\Templates\OrderItemTemplate.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\Templates\OrderTemplate.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\Templates\ProductTemplate.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\BasketView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\CatalogView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\CheckoutView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\CustomNavigationView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\FiltersView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\LoginView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\MainView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\OrderDetailView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\ProfileView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\SettingsView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="App.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\CampaignView.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\CampaignDetailsView.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\Templates\CampaignTemplate.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
-  </Target>
-  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config.bak b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config.bak
deleted file mode 100644
index 1b96855ee..000000000
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config.bak
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Acr.Support" version="2.1.0" targetFramework="monoandroid70" />
-  <package id="Acr.UserDialogs" version="6.3.3" targetFramework="monoandroid70" />
-  <package id="AndHUD" version="1.2.0" targetFramework="monoandroid70" />
-  <package id="Autofac" version="4.5.0" targetFramework="monoandroid60" />
-  <package id="IdentityModel" version="1.3.1" targetFramework="monoandroid60" />
-  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="monoandroid60" />
-  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="monoandroid60" />
-  <package id="Microsoft.CSharp" version="4.0.1" targetFramework="monoandroid70" />
-  <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="monoandroid70" />
-  <package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="monoandroid60" />
-  <package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="monoandroid60" />
-  <package id="modernhttpclient" version="2.4.2" targetFramework="monoandroid70" />
-  <package id="NETStandard.Library" version="1.6.0" targetFramework="monoandroid60" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="monoandroid60" />
-  <package id="PCLCrypto" version="2.0.147" targetFramework="monoandroid60" />
-  <package id="PInvoke.BCrypt" version="0.3.2" targetFramework="monoandroid60" />
-  <package id="PInvoke.Kernel32" version="0.3.2" targetFramework="monoandroid60" />
-  <package id="PInvoke.NCrypt" version="0.3.2" targetFramework="monoandroid60" />
-  <package id="PInvoke.Windows.Core" version="0.3.2" targetFramework="monoandroid60" />
-  <package id="Plugin.CurrentActivity" version="1.0.1" targetFramework="monoandroid60" />
-  <package id="Plugin.Permissions" version="1.1.7" targetFramework="monoandroid60" />
-  <package id="SlideOverKit" version="2.1.4" targetFramework="monoandroid70" />
-  <package id="Splat" version="1.6.2" targetFramework="monoandroid70" />
-  <package id="System.AppContext" version="4.1.0" targetFramework="monoandroid60" />
-  <package id="System.Collections" version="4.0.11" targetFramework="monoandroid70" />
-  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="monoandroid60" />
-  <package id="System.ComponentModel" version="4.0.1" targetFramework="monoandroid60" />
-  <package id="System.Console" version="4.0.0" targetFramework="monoandroid60" />
-  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="monoandroid70" />
-  <package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="monoandroid60" />
-  <package id="System.Diagnostics.Tracing" version="4.1.0" targetFramework="monoandroid60" />
-  <package id="System.Dynamic.Runtime" version="4.0.11" targetFramework="monoandroid70" />
-  <package id="System.Globalization" version="4.0.11" targetFramework="monoandroid70" />
-  <package id="System.Globalization.Calendars" version="4.0.1" targetFramework="monoandroid60" />
-  <package id="System.IO" version="4.1.0" targetFramework="monoandroid70" />
-  <package id="System.IO.Compression" version="4.1.0" targetFramework="monoandroid60" />
-  <package id="System.IO.Compression.ZipFile" version="4.0.1" targetFramework="monoandroid60" />
-  <package id="System.IO.FileSystem" version="4.0.1" targetFramework="monoandroid60" />
-  <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="monoandroid60" />
-  <package id="System.Linq" version="4.1.0" targetFramework="monoandroid70" />
-  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="monoandroid70" />
-  <package id="System.Net.Http" version="4.1.0" targetFramework="monoandroid60" />
-  <package id="System.Net.Primitives" version="4.0.11" targetFramework="monoandroid60" />
-  <package id="System.Net.Sockets" version="4.1.0" targetFramework="monoandroid60" />
-  <package id="System.ObjectModel" version="4.0.12" targetFramework="monoandroid70" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="monoandroid70" />
-  <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="monoandroid70" />
-  <package id="System.Reflection.Primitives" version="4.0.1" targetFramework="monoandroid60" />
-  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="monoandroid70" />
-  <package id="System.Runtime" version="4.1.0" targetFramework="monoandroid70" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="monoandroid70" />
-  <package id="System.Runtime.Handles" version="4.0.1" targetFramework="monoandroid60" />
-  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="monoandroid60" />
-  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="monoandroid60" />
-  <package id="System.Runtime.Numerics" version="4.0.1" targetFramework="monoandroid70" />
-  <package id="System.Runtime.Serialization.Primitives" version="4.1.1" targetFramework="monoandroid70" />
-  <package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="monoandroid60" />
-  <package id="System.Security.Cryptography.Encoding" version="4.0.0" targetFramework="monoandroid60" />
-  <package id="System.Security.Cryptography.Primitives" version="4.0.0" targetFramework="monoandroid60" />
-  <package id="System.Security.Cryptography.X509Certificates" version="4.1.0" targetFramework="monoandroid60" />
-  <package id="System.Text.Encoding" version="4.0.11" targetFramework="monoandroid70" />
-  <package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="monoandroid70" />
-  <package id="System.Text.RegularExpressions" version="4.1.0" targetFramework="monoandroid70" />
-  <package id="System.Threading" version="4.0.11" targetFramework="monoandroid70" />
-  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="monoandroid70" />
-  <package id="System.Threading.Timer" version="4.0.1" targetFramework="monoandroid60" />
-  <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="monoandroid70" />
-  <package id="System.Xml.XDocument" version="4.0.11" targetFramework="monoandroid70" />
-  <package id="Validation" version="2.2.8" targetFramework="monoandroid60" />
-  <package id="Xam.Plugin.Geolocator" version="3.0.4" targetFramework="monoandroid60" />
-  <package id="Xam.Plugins.Settings" version="2.6.0.12-beta" targetFramework="monoandroid70" />
-  <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid70" />
-  <package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="monoandroid70" />
-  <package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid70" />
-  <package id="Xamarin.Android.Support.v7.AppCompat" version="23.3.0" targetFramework="monoandroid70" />
-  <package id="Xamarin.Android.Support.v7.CardView" version="23.3.0" targetFramework="monoandroid70" />
-  <package id="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0" targetFramework="monoandroid70" />
-  <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid70" />
-  <package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="monoandroid70" />
-  <package id="Xamarin.FFImageLoading" version="2.2.9" targetFramework="monoandroid60" />
-  <package id="Xamarin.FFImageLoading.Forms" version="2.2.9" targetFramework="monoandroid60" />
-  <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="monoandroid60" />
-</packages>
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj.bak b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj.bak
deleted file mode 100644
index fd8c23eca..000000000
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj.bak
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{F7B6A162-BC4D-4924-B16A-713F9B0344E7}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>eShopOnContainers.UnitTests</RootNamespace>
-    <AssemblyName>eShopOnContainers.UnitTests</AssemblyName>
-    <DefaultLanguage>es-ES</DefaultLanguage>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Mocks\MockEventToCommandBehavior.cs" />
-    <Compile Include="Services\BasketServiceTests.cs" />
-    <Compile Include="Services\CatalogServiceTests.cs" />
-    <Compile Include="Services\MarketingServiceTests.cs" />
-    <Compile Include="ViewModels\CatalogViewModelTests.cs" />
-    <Compile Include="ViewModels\MainViewModelTests.cs" />
-    <Compile Include="ViewModels\MarketingViewModelTests.cs" />
-    <Compile Include="ViewModels\OrderViewModelTests.cs" />
-    <Compile Include="Services\OrdersServiceTests.cs" />
-    <Compile Include="Behaviors\EventToCommandBehaviorTests.cs" />
-    <Compile Include="Mocks\MockViewModel.cs" />
-    <Compile Include="ViewModels\MockViewModelTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\eShopOnContainers.Core\eShopOnContainers.Core.csproj">
-      <Project>{67f9d3a8-f71e-4428-913f-c37ae82cdb24}</Project>
-      <Name>eShopOnContainers.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
-</Project>
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config.bak b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config.bak
deleted file mode 100644
index 0765f47f9..000000000
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config.bak
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Acr.Support" version="2.1.0" targetFramework="xamarinios10" />
-  <package id="Acr.UserDialogs" version="6.3.3" targetFramework="xamarinios10" />
-  <package id="Autofac" version="4.5.0" targetFramework="xamarinios10" />
-  <package id="IdentityModel" version="1.3.1" targetFramework="xamarinios10" />
-  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="xamarinios10" />
-  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="xamarinios10" />
-  <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="xamarinios10" />
-  <package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="xamarinios10" />
-  <package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="xamarinios10" />
-  <package id="modernhttpclient" version="2.4.2" targetFramework="xamarinios10" />
-  <package id="NETStandard.Library" version="1.6.0" targetFramework="xamarinios10" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="xamarinios10" />
-  <package id="PCLCrypto" version="2.0.147" targetFramework="xamarinios10" />
-  <package id="PInvoke.BCrypt" version="0.3.2" targetFramework="xamarinios10" />
-  <package id="PInvoke.Kernel32" version="0.3.2" targetFramework="xamarinios10" />
-  <package id="PInvoke.NCrypt" version="0.3.2" targetFramework="xamarinios10" />
-  <package id="PInvoke.Windows.Core" version="0.3.2" targetFramework="xamarinios10" />
-  <package id="SlideOverKit" version="2.1.4" targetFramework="xamarinios10" />
-  <package id="Splat" version="1.6.2" targetFramework="xamarinios10" />
-  <package id="System.AppContext" version="4.1.0" targetFramework="xamarinios10" />
-  <package id="System.Collections" version="4.0.11" targetFramework="xamarinios10" />
-  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="xamarinios10" />
-  <package id="System.ComponentModel" version="4.0.1" targetFramework="xamarinios10" />
-  <package id="System.Console" version="4.0.0" targetFramework="xamarinios10" />
-  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="xamarinios10" />
-  <package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="xamarinios10" />
-  <package id="System.Diagnostics.Tracing" version="4.1.0" targetFramework="xamarinios10" />
-  <package id="System.Globalization" version="4.0.11" targetFramework="xamarinios10" />
-  <package id="System.Globalization.Calendars" version="4.0.1" targetFramework="xamarinios10" />
-  <package id="System.IO" version="4.1.0" targetFramework="xamarinios10" />
-  <package id="System.IO.Compression" version="4.1.0" targetFramework="xamarinios10" />
-  <package id="System.IO.Compression.ZipFile" version="4.0.1" targetFramework="xamarinios10" />
-  <package id="System.IO.FileSystem" version="4.0.1" targetFramework="xamarinios10" />
-  <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="xamarinios10" />
-  <package id="System.Linq" version="4.1.0" targetFramework="xamarinios10" />
-  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="xamarinios10" />
-  <package id="System.Net.Http" version="4.1.0" targetFramework="xamarinios10" />
-  <package id="System.Net.Primitives" version="4.0.11" targetFramework="xamarinios10" />
-  <package id="System.Net.Sockets" version="4.1.0" targetFramework="xamarinios10" />
-  <package id="System.ObjectModel" version="4.0.12" targetFramework="xamarinios10" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="xamarinios10" />
-  <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="xamarinios10" />
-  <package id="System.Reflection.Primitives" version="4.0.1" targetFramework="xamarinios10" />
-  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="xamarinios10" />
-  <package id="System.Runtime" version="4.1.0" targetFramework="xamarinios10" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="xamarinios10" />
-  <package id="System.Runtime.Handles" version="4.0.1" targetFramework="xamarinios10" />
-  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="xamarinios10" />
-  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="xamarinios10" />
-  <package id="System.Runtime.Numerics" version="4.0.1" targetFramework="xamarinios10" />
-  <package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="xamarinios10" />
-  <package id="System.Security.Cryptography.Encoding" version="4.0.0" targetFramework="xamarinios10" />
-  <package id="System.Security.Cryptography.Primitives" version="4.0.0" targetFramework="xamarinios10" />
-  <package id="System.Security.Cryptography.X509Certificates" version="4.1.0" targetFramework="xamarinios10" />
-  <package id="System.Text.Encoding" version="4.0.11" targetFramework="xamarinios10" />
-  <package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="xamarinios10" />
-  <package id="System.Text.RegularExpressions" version="4.1.0" targetFramework="xamarinios10" />
-  <package id="System.Threading" version="4.0.11" targetFramework="xamarinios10" />
-  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="xamarinios10" />
-  <package id="System.Threading.Timer" version="4.0.1" targetFramework="xamarinios10" />
-  <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="xamarinios10" />
-  <package id="System.Xml.XDocument" version="4.0.11" targetFramework="xamarinios10" />
-  <package id="Validation" version="2.2.8" targetFramework="xamarinios10" />
-  <package id="WebP.Touch" version="1.0.3" targetFramework="xamarinios10" />
-  <package id="Xam.Plugin.Geolocator" version="3.0.4" targetFramework="xamarinios10" />
-  <package id="Xam.Plugins.Settings" version="2.6.0.12-beta" targetFramework="xamarinios10" />
-  <package id="Xamarin.FFImageLoading" version="2.2.9" targetFramework="xamarinios10" />
-  <package id="Xamarin.FFImageLoading.Forms" version="2.2.9" targetFramework="xamarinios10" />
-  <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="xamarinios10" />
-</packages>
\ No newline at end of file