diff --git a/app/code/Magento/Customer/Model/Address.php b/app/code/Magento/Customer/Model/Address.php
index 376390011056d..1206f157c7fc5 100644
--- a/app/code/Magento/Customer/Model/Address.php
+++ b/app/code/Magento/Customer/Model/Address.php
@@ -169,16 +169,6 @@ public function updateData(AddressInterface $address)
         return $this;
     }
 
-    /**
-     * Create address data object based on current address model.
-     *
-     * @param int|null $defaultBillingAddressId
-     * @param int|null $defaultShippingAddressId
-     * @return AddressInterface
-     * Use Api/Data/AddressInterface as a result of service operations. Don't rely on the model to provide
-     * the instance of Api/Data/AddressInterface
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     */
     public function getDataModel($defaultBillingAddressId = null, $defaultShippingAddressId = null)
     {
         if ($this->getCustomerId() || $this->getParentId()) {
@@ -371,7 +361,7 @@ public function reindex()
     /**
      * Get a list of custom attribute codes.
      *
-     * {@inheritdoc}
+     * By default, entity can be extended only using extension attributes functionality.
      *
      * @return string[]
      * @since 100.0.6
diff --git a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
index b5696d5b19ee5..e90aa5e319c65 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
@@ -299,44 +299,18 @@ private function populateCustomerWithSecureData($customerModel, $passwordHash =
         }
     }
 
-    /**
-     * Retrieve customer.
-     *
-     * @param string $email
-     * @param int|null $websiteId
-     * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @throws \Magento\Framework\Exception\NoSuchEntityException If customer with the specified email does not exist.
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
     public function get($email, $websiteId = null)
     {
         $customerModel = $this->customerRegistry->retrieveByEmail($email, $websiteId);
         return $customerModel->getDataModel();
     }
 
-    /**
-     * Get customer by Customer ID.
-     *
-     * @param int $customerId
-     * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @throws \Magento\Framework\Exception\NoSuchEntityException If customer with the specified ID does not exist.
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
     public function getById($customerId)
     {
         $customerModel = $this->customerRegistry->retrieve($customerId);
         return $customerModel->getDataModel();
     }
 
-    /**
-     * Retrieve customers which match a specified criteria.
-     *
-     * {@inheritdoc}
-     *
-     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
-     * @return \Magento\Customer\Api\Data\CustomerSearchResultsInterface
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
     public function getList(SearchCriteriaInterface $searchCriteria)
     {
         $searchResults = $this->searchResultsFactory->create();
@@ -374,26 +348,11 @@ public function getList(SearchCriteriaInterface $searchCriteria)
         return $searchResults;
     }
 
-    /**
-     * Delete customer.
-     *
-     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
-     * @return bool true on success
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
     public function delete(CustomerInterface $customer)
     {
         return $this->deleteById($customer->getId());
     }
 
-    /**
-     * Delete customer by Customer ID.
-     *
-     * @param int $customerId
-     * @return bool true on success
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
     public function deleteById($customerId)
     {
         $customerModel = $this->customerRegistry->retrieve($customerId);