diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
index 044ade39edc271c3b8d5d1b4f9aebcb1cc740e90..d3452e6042ef3c040a0d644ff3ae2fa4009f9c02 100644
--- a/app/code/Magento/Captcha/composer.json
+++ b/app/code/Magento/Captcha/composer.json
@@ -6,7 +6,6 @@
         "magento/module-store": "0.74.0-beta14",
         "magento/module-customer": "0.74.0-beta14",
         "magento/module-checkout": "0.74.0-beta14",
-        "magento/module-quote": "0.74.0-beta14",
         "magento/module-backend": "0.74.0-beta14",
         "magento/framework": "0.74.0-beta14",
         "magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
index 571a433e5f46190a3aa3fa7f11c61ff1ca0e5cfa..20332513a009f078db5fc7cd3468894ccaaac593 100644
--- a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
+++ b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
@@ -65,8 +65,9 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
         )) {
             $jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']
             ['payment']['children']['payments-list']['children'] =
-                array_merge_recursive($jsLayout['components']['checkout']['children']['steps']['children']
-                ['billing-step']['children']['payment']['children']['payments-list']['children'],
+                array_merge_recursive(
+                    $jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']
+                    ['payment']['children']['payments-list']['children'],
                     $this->processPaymentConfiguration(
                         $jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']
                         ['payment']['children']['renders']['children'],
diff --git a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
index 34f11e2b16a00f8cef6a6eddcfc15b132809b471..75e2539835e50cad7c7ff97d185044196423bf5d 100644
--- a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
@@ -33,7 +33,6 @@ class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPa
         \Magento\Quote\Api\GuestBillingAddressManagementInterface $billingAddressManagement,
         \Magento\Quote\Api\GuestPaymentMethodManagementInterface $paymentMethodManagement,
         \Magento\Quote\Api\GuestCartManagementInterface $cartManagement
-
     ) {
         $this->billingAddressManagement = $billingAddressManagement;
         $this->paymentMethodManagement = $paymentMethodManagement;
@@ -63,7 +62,7 @@ class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPa
         \Magento\Quote\Api\Data\AddressInterface $billingAddress
     ) {
         $billingAddress->setEmail($email);
-        $this->billingAddressManagement->assign($cartId,  $billingAddress);
+        $this->billingAddressManagement->assign($cartId, $billingAddress);
         $this->paymentMethodManagement->set($cartId, $paymentMethod);
         return true;
     }
diff --git a/app/code/Magento/Checkout/Model/PaymentInformationManagement.php b/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
index c3c3c7a6c5e05c282543a863b2258c45374e070e..ff4b973c6298e3b95265a2d121aa51bac501804f 100644
--- a/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
@@ -33,7 +33,6 @@ class PaymentInformationManagement implements \Magento\Checkout\Api\PaymentInfor
         \Magento\Quote\Api\BillingAddressManagementInterface $billingAddressManagement,
         \Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement,
         \Magento\Quote\Api\CartManagementInterface $cartManagement
-
     ) {
         $this->billingAddressManagement = $billingAddressManagement;
         $this->paymentMethodManagement = $paymentMethodManagement;
diff --git a/app/code/Magento/Checkout/Model/ShippingInformationManagement.php b/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
index ab96630bea5d9a61ea86ba5b728f89ffbef2ac20..0dab1711744e5f938367da542c4c64bff7becf02 100644
--- a/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
@@ -12,16 +12,7 @@ use Psr\Log\LoggerInterface as Logger;
 use \Magento\Quote\Model\QuoteAddressValidator;
 
 class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInformationManagementInterface
-{/**
- * @var \Magento\Quote\Api\GuestShippingAddressManagementInterface
- */
-    protected $shippingAddressManagement;
-
-    /**
-     * @var \Magento\Quote\Api\GuestShippingMethodManagementInterface
-     */
-    protected $shippingMethodManagement;
-
+{
     /**
      * @var \Magento\Quote\Api\PaymentMethodManagementInterface
      */
@@ -69,15 +60,16 @@ class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInf
     protected $scopeConfig;
 
     /**
-     * @param \Magento\Quote\Api\ShippingAddressManagementInterface $shippingAddressManagement
-     * @param \Magento\Quote\Api\ShippingMethodManagementInterface $shippingMethodManagement
      * @param \Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement
-     * @param PaymentDetailsFactory $paymentDetailsFactory
+     * @param \Magento\Checkout\Model\PaymentDetailsFactory $paymentDetailsFactory
      * @param \Magento\Quote\Api\CartTotalRepositoryInterface $cartTotalsRepository
+     * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+     * @param \Magento\Quote\Model\QuoteAddressValidator $addressValidator
+     * @param Logger $logger
+     * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      */
     public function __construct(
-        \Magento\Quote\Api\ShippingAddressManagementInterface $shippingAddressManagement,
-        \Magento\Quote\Api\ShippingMethodManagementInterface $shippingMethodManagement,
         \Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement,
         \Magento\Checkout\Model\PaymentDetailsFactory $paymentDetailsFactory,
         \Magento\Quote\Api\CartTotalRepositoryInterface $cartTotalsRepository,
@@ -87,8 +79,6 @@ class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInf
         \Magento\Customer\Api\AddressRepositoryInterface $addressRepository,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
     ) {
-        $this->shippingAddressManagement = $shippingAddressManagement;
-        $this->shippingMethodManagement = $shippingMethodManagement;
         $this->paymentMethodManagement = $paymentMethodManagement;
         $this->paymentDetailsFactory = $paymentDetailsFactory;
         $this->cartTotalsRepository = $cartTotalsRepository;
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Cart/ImageProviderTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Cart/ImageProviderTest.php
index 7166fd7e97cb172577fffe409ac5f573b410099c..29b91231adb10d532df997da73c74117859b5098 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/Cart/ImageProviderTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/Cart/ImageProviderTest.php
@@ -27,7 +27,7 @@ class ImageProviderTest extends \PHPUnit_Framework_TestCase
     {
         $this->itemRepositoryMock = $this->getMock('Magento\Quote\Api\CartItemRepositoryInterface', [], [], '', false);
         $this->itemPoolMock = $this->getMock('Magento\Checkout\CustomerData\ItemPoolInterface', [], [], '', false);
-        $this->model = new \Magento\Checkout\Model\Cart\ImageProvider (
+        $this->model = new \Magento\Checkout\Model\Cart\ImageProvider(
             $this->itemRepositoryMock,
             $this->itemPoolMock
         );
diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json
index 28936c416e31dc474a95b0687d98edef469ba886..e8c5101da3db5419aec1bdba672036cfcbb060ae 100644
--- a/app/code/Magento/CheckoutAgreements/composer.json
+++ b/app/code/Magento/CheckoutAgreements/composer.json
@@ -6,7 +6,6 @@
         "magento/module-checkout": "0.74.0-beta14",
         "magento/module-store": "0.74.0-beta14",
         "magento/module-backend": "0.74.0-beta14",
-        "magento/module-ui": "0.74.0-beta14",
         "magento/framework": "0.74.0-beta14",
         "magento/magento-composer-installer": "*"
     },
diff --git a/app/code/Magento/Tax/Model/Quote/GrandTotalDetailsPlugin.php b/app/code/Magento/Tax/Model/Quote/GrandTotalDetailsPlugin.php
index 3cd2942d9e070b1b2a195d73c07ef591207cc637..1de7b6d223d5648f009b1598917b54d46dc6643c 100644
--- a/app/code/Magento/Tax/Model/Quote/GrandTotalDetailsPlugin.php
+++ b/app/code/Magento/Tax/Model/Quote/GrandTotalDetailsPlugin.php
@@ -8,7 +8,6 @@ namespace Magento\Tax\Model\Quote;
 use Magento\Quote\Model\Cart\CartTotalRepository;
 use Magento\Quote\Api\Data\TotalsExtensionFactory;
 
-
 class GrandTotalDetailsPlugin
 {
     /**