diff --git a/admin/fieldnames/index.php b/admin/fieldnames/index.php
index 3f648a9b..92ae663d 100644
--- a/admin/fieldnames/index.php
+++ b/admin/fieldnames/index.php
@@ -1,10 +1,10 @@
-<?php 
+<?php
 /*
 This file is part of Ice Framework.
 
 ------------------------------------------------------------------
 
-Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]  
+Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]
 Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilinah)
  */
 
@@ -13,12 +13,12 @@ define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
 ?><div class="span9">
-			  
+
 	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
         <li class="active"><a id="tabEmployeeFieldName" href="#tabPageEmployeeFieldName"><?=t('Employee Field Names')?></a></li>
         <li><a id="tabEmployeeCustomField" href="#tabPageEmployeeCustomField"><?=t('Employee Custom Fields')?></a></li>
 	</ul>
-	 
+
 	<div class="tab-content">
         <div class="tab-pane active" id="tabPageEmployeeFieldName">
             <div id="EmployeeFieldName" class="reviewBlock" data-content="List" style="padding-left:5px;">
@@ -44,6 +44,7 @@ var modJsList = new Array();
 
 modJsList['tabEmployeeFieldName'] = new FieldNameAdapter('FieldNameMapping','EmployeeFieldName',{"type":"Employee"});
 modJsList['tabEmployeeFieldName'].setRemoteTable(true);
+modJsList['tabEmployeeFieldName'].setShowDelete(false);
 modJsList['tabEmployeeFieldName'].setShowAddNew(false);
 
 modJsList['tabEmployeeCustomField'] = new CustomFieldAdapter('CustomField','EmployeeCustomField',{"type":"Employee"},"display_order desc");
@@ -54,4 +55,4 @@ modJsList['tabEmployeeCustomField'].setTableType("Employee");
 var modJs = modJsList['tabEmployeeFieldName'];
 
 </script>
-<?php include APP_BASE_PATH.'footer.php';?>      
+<?php include APP_BASE_PATH.'footer.php';?>
diff --git a/scripts/icehrm_master_data.sql b/scripts/icehrm_master_data.sql
index 1a053f67..0b35e1b3 100644
--- a/scripts/icehrm_master_data.sql
+++ b/scripts/icehrm_master_data.sql
@@ -1270,18 +1270,6 @@ INSERT INTO `FieldNameMappings` (`type`, `name`, `textOrig`, `textMapped`, `disp
   ('Employee', 'notes', 'Notes', 'Notes', 'Form');
 
 
-INSERT INTO `CustomFields` (`type`, `name`, `data`,`display`) VALUES
-  ('Employee', 'custom1', '', 'Hidden'),
-  ('Employee', 'custom2', '', 'Hidden'),
-  ('Employee', 'custom3', '', 'Hidden'),
-  ('Employee', 'custom4', '', 'Hidden'),
-  ('Employee', 'custom5', '', 'Hidden'),
-  ('Employee', 'custom6', '', 'Hidden'),
-  ('Employee', 'custom7', '', 'Hidden'),
-  ('Employee', 'custom8', '', 'Hidden'),
-  ('Employee', 'custom9', '', 'Hidden'),
-  ('Employee', 'custom10', '', 'Hidden');
-
 INSERT INTO `ImmigrationStatus` VALUES
   (1,'Citizen'),
   (2,'Permanent Resident'),