diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
index 7d740df2fe..99d750a2a8 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
@@ -210,7 +210,6 @@ ReadClockGeneratorID (
   IN     UINT8                         ClockAddress
   )
 {
-  EFI_STATUS                    Status;
   EFI_SMBUS_DEVICE_ADDRESS      SlaveAddress;
   UINT8                         Buffer[MAX_CLOCK_GENERATOR_BUFFER_LENGTH];
   UINTN                         Length;
@@ -222,7 +221,7 @@ ReadClockGeneratorID (
   SlaveAddress.SmbusDeviceAddress = ClockAddress >> 1;
   Length = sizeof (Buffer);
   Command = 0;
-  Status = SmbusPpi->Execute (
+  SmbusPpi->Execute (
     PeiServices,
     SmbusPpi,
     SlaveAddress,
@@ -271,7 +270,6 @@ ConfigurePlatformClocks (
 
   EFI_PLATFORM_INFO_HOB         *PlatformInfoHob;
   BOOLEAN                       EnableSpreadSpectrum;
-  UINT8                         ClockGenID=0;
   SYSTEM_CONFIGURATION          SystemConfiguration;
 
   UINTN                         Length;
@@ -322,7 +320,6 @@ ConfigurePlatformClocks (
       DEBUG((EFI_D_ERROR, "Clock Generator CK505 Not Present, vendor ID on board is %x\n",(Data & 0x0F)));
       return EFI_SUCCESS;
 }
-  ClockGenID = Data & 0x0F;
 
   EnableSpreadSpectrum = FALSE;
   VariableSize = sizeof (SYSTEM_CONFIGURATION);
diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.c b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.c
index d32deb5b6c..dedcbe4d29 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.c
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.c
@@ -34,8 +34,7 @@ MultiPlatformInfoInit (
   IN OUT EFI_PLATFORM_INFO_HOB          *PlatformInfoHob
   )
 {
-  UINT32                                PcieLength;
-  EFI_STATUS      Status;
+  UINT32 PcieLength;
 
 
   PlatformInfoHob->IohSku = MmPci16(0, MC_BUS, MC_DEV, MC_FUN, PCI_DEVICE_ID_OFFSET);
@@ -52,10 +51,10 @@ MultiPlatformInfoInit (
 
   PlatformInfoHob->IchRevision = PchLpcPciCfg8(PCI_REVISION_ID_OFFSET);
 
-  	//
-    //64MB
-    //
-    PcieLength = 0x04000000;
+  //
+  //64MB
+  //
+  PcieLength = 0x04000000;
 
   //
   // Don't support BASE above 4GB currently.
@@ -95,28 +94,32 @@ MultiPlatformInfoInit (
   //
   PlatformInfoHob->SysData.SysIoApicEnable  = ICH_IOAPIC;
 
-   DEBUG ((EFI_D_ERROR,  "PlatformFlavor is %x (%x=tablet,%x=mobile,%x=desktop)\n", PlatformInfoHob->PlatformFlavor,FlavorTablet,FlavorMobile,FlavorDesktop));
+  DEBUG ((EFI_D_ERROR, "PlatformFlavor is %x (%x=tablet,%x=mobile,%x=desktop)\n",
+    PlatformInfoHob->PlatformFlavor,
+    FlavorTablet,
+    FlavorMobile,
+    FlavorDesktop));
 
-    //
-    // Get Platform Info and fill the Hob.
-    //
-    PlatformInfoHob->RevisonId = PLATFORM_INFO_HOB_REVISION;
+  //
+  // Get Platform Info and fill the Hob.
+  //
+  PlatformInfoHob->RevisonId = PLATFORM_INFO_HOB_REVISION;
 
-      //
-      // Get GPIO table
-      //
-      Status = MultiPlatformGpioTableInit (PeiServices, PlatformInfoHob);
+  //
+  // Get GPIO table
+  //
+  MultiPlatformGpioTableInit (PeiServices, PlatformInfoHob);
 
-      //
-      // Program GPIO
-      //
-      Status = MultiPlatformGpioProgram (PeiServices, PlatformInfoHob);
+  //
+  // Program GPIO
+  //
+  MultiPlatformGpioProgram (PeiServices, PlatformInfoHob);
 
-      //
-      // Update OemId
-      //
-      Status = InitializeBoardOemId (PeiServices, PlatformInfoHob);
-      Status = InitializeBoardSsidSvid (PeiServices, PlatformInfoHob);
+  //
+  // Update OemId
+  //
+  InitializeBoardOemId (PeiServices, PlatformInfoHob);
+  InitializeBoardSsidSvid (PeiServices, PlatformInfoHob);
 
-    return EFI_SUCCESS;
+  return EFI_SUCCESS;
 }