diff --git a/stmhal/Makefile b/stmhal/Makefile
index b1308dc7d1..abf78ee8da 100644
--- a/stmhal/Makefile
+++ b/stmhal/Makefile
@@ -76,7 +76,6 @@ SRC_C = \
 	string0.c \
 	system_stm32f4xx.c \
 	stm32f4xx_it.c \
-	stm32f4xx_hal_msp.c \
 	usbd_conf.c \
 	usbd_desc_cdc_msc.c \
 	usbd_cdc_interface.c \
diff --git a/stmhal/rtc.c b/stmhal/rtc.c
index 7a89d93e71..f58aa92733 100644
--- a/stmhal/rtc.c
+++ b/stmhal/rtc.c
@@ -161,7 +161,7 @@ void rtc_init(void) {
 }
 #endif
 
-static void RTC_CalendarConfig(void);
+STATIC void RTC_CalendarConfig(void);
 
 void rtc_init(void) {
     RTCHandle.Instance = RTC;
@@ -211,7 +211,7 @@ void rtc_init(void) {
     }
 }
 
-static void RTC_CalendarConfig(void) {
+STATIC void RTC_CalendarConfig(void) {
     // set the date to 1st Jan 2014
     RTC_DateTypeDef date;
     date.Year = 14;
@@ -242,6 +242,49 @@ static void RTC_CalendarConfig(void) {
     HAL_RTCEx_BKUPWrite(&RTCHandle, RTC_BKP_DR0, 0x32f2);
 }
 
+/*
+  Note: Care must be taken when HAL_RCCEx_PeriphCLKConfig() is used to select
+  the RTC clock source; in this case the Backup domain will be reset in
+  order to modify the RTC Clock source, as consequence RTC registers (including
+  the backup registers) and RCC_BDCR register are set to their reset values.
+*/
+void HAL_RTC_MspInit(RTC_HandleTypeDef *hrtc) {
+    RCC_OscInitTypeDef        RCC_OscInitStruct;
+    RCC_PeriphCLKInitTypeDef  PeriphClkInitStruct;
+
+    /* To change the source clock of the RTC feature (LSE, LSI), You have to:
+       - Enable the power clock using __PWR_CLK_ENABLE()
+       - Enable write access using HAL_PWR_EnableBkUpAccess() function before to
+         configure the RTC clock source (to be done once after reset).
+       - Reset the Back up Domain using __HAL_RCC_BACKUPRESET_FORCE() and
+         __HAL_RCC_BACKUPRESET_RELEASE().
+       - Configure the needed RTc clock source */
+
+    // set LSE as RTC clock source
+    RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
+    RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+    RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+    RCC_OscInitStruct.LSIState = RCC_LSI_OFF;
+    if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
+        //Error_Handler();
+        return;
+    }
+
+    PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+    PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
+    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) {
+        //Error_Handler();
+        return;
+    }
+
+    // enable RTC peripheral clock
+    __HAL_RCC_RTC_ENABLE();
+}
+
+void HAL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc) {
+    __HAL_RCC_RTC_DISABLE();
+}
+
 /******************************************************************************/
 // Micro Python bindings
 
diff --git a/stmhal/stm32f4xx_hal_msp.c b/stmhal/stm32f4xx_hal_msp.c
deleted file mode 100644
index 90baa41f82..0000000000
--- a/stmhal/stm32f4xx_hal_msp.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * Original template from ST Cube library.  See below for header.
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
-  ******************************************************************************
-  * @file    Templates/Src/stm32f4xx_hal_msp.c
-  * @author  MCD Application Team
-  * @version V1.0.1
-  * @date    26-February-2014
-  * @brief   HAL MSP module.
-  *
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; COPYRIGHT(c) 2014 STMicroelectronics</center></h2>
-  *
-  * Redistribution and use in source and binary forms, with or without modification,
-  * are permitted provided that the following conditions are met:
-  *   1. Redistributions of source code must retain the above copyright notice,
-  *      this list of conditions and the following disclaimer.
-  *   2. Redistributions in binary form must reproduce the above copyright notice,
-  *      this list of conditions and the following disclaimer in the documentation
-  *      and/or other materials provided with the distribution.
-  *   3. Neither the name of STMicroelectronics nor the names of its contributors
-  *      may be used to endorse or promote products derived from this software
-  *      without specific prior written permission.
-  *
-  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  *
-  ******************************************************************************
-  */
-
-#include "stm32f4xx_hal.h"
-
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "servo.h"
-
-/**
-  * @brief  Initializes the Global MSP.
-  * @param  None
-  * @retval None
-  */
-void HAL_MspInit(void) {
-}
-
-/**
-  * @brief  DeInitializes the Global MSP.
-  * @param  None
-  * @retval None
-  */
-void HAL_MspDeInit(void) {
-}
-
-/**
-  * @brief RTC MSP Initialization
-  *        This function configures the hardware resources used in this example
-  * @param hrtc: RTC handle pointer
-  *
-  * @note  Care must be taken when HAL_RCCEx_PeriphCLKConfig() is used to select
-  *        the RTC clock source; in this case the Backup domain will be reset in
-  *        order to modify the RTC Clock source, as consequence RTC registers (including
-  *        the backup registers) and RCC_BDCR register are set to their reset values.
-  *
-  * @retval None
-  */
-void HAL_RTC_MspInit(RTC_HandleTypeDef *hrtc) {
-  RCC_OscInitTypeDef        RCC_OscInitStruct;
-  RCC_PeriphCLKInitTypeDef  PeriphClkInitStruct;
-
-  /* To change the source clock of the RTC feature (LSE, LSI), You have to:
-     - Enable the power clock using __PWR_CLK_ENABLE()
-     - Enable write access using HAL_PWR_EnableBkUpAccess() function before to
-       configure the RTC clock source (to be done once after reset).
-     - Reset the Back up Domain using __HAL_RCC_BACKUPRESET_FORCE() and
-       __HAL_RCC_BACKUPRESET_RELEASE().
-     - Configure the needed RTc clock source */
-
-  /*##-1- Configue LSE as RTC clock soucre ###################################*/
-  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
-  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
-  RCC_OscInitStruct.LSIState = RCC_LSI_OFF;
-  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
-    //Error_Handler();
-    return;
-  }
-
-  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
-  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
-  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) {
-    //Error_Handler();
-    return;
-  }
-
-  /*##-2- Enable RTC peripheral Clocks #######################################*/
-  /* Enable RTC Clock */
-  __HAL_RCC_RTC_ENABLE();
-}
-
-/**
-  * @brief RTC MSP De-Initialization
-  *        This function frees the hardware resources used in this example:
-  *          - Disable the Peripheral's clock
-  * @param hrtc: RTC handle pointer
-  * @retval None
-  */
-void HAL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc) {
-  /*##-1- Reset peripherals ##################################################*/
-   __HAL_RCC_RTC_DISABLE();
-}