diff --git a/components/lib/calendar/Calendar.js b/components/lib/calendar/Calendar.js
index fc05326231..5a80e091d3 100644
--- a/components/lib/calendar/Calendar.js
+++ b/components/lib/calendar/Calendar.js
@@ -18,7 +18,6 @@ export const Calendar = React.memo(
         const inputRef = React.useRef(props.inputRef);
         const navigation = React.useRef(null);
         const ignoreFocusFunctionality = React.useRef(false);
-        const isKeydown = React.useRef(false);
         const timePickerTimer = React.useRef(null);
         const viewStateChanged = React.useRef(false);
         const touchUIMask = React.useRef(null);
@@ -74,8 +73,6 @@ export const Calendar = React.memo(
         };
 
         const onInputKeyDown = (event) => {
-            isKeydown.current = true;
-
             switch (event.which) {
                 //escape
                 case 27: {
@@ -97,12 +94,6 @@ export const Calendar = React.memo(
         };
 
         const onUserInput = (event) => {
-            // IE 11 Workaround for input placeholder
-            if (!isKeydown.current) {
-                return;
-            }
-            isKeydown.current = false;
-
             updateValueOnInput(event, event.target.value);
             props.onInput && props.onInput(event);
         };
diff --git a/components/lib/fileupload/FileUpload.js b/components/lib/fileupload/FileUpload.js
index 3b0f85ec76..e600c9304c 100644
--- a/components/lib/fileupload/FileUpload.js
+++ b/components/lib/fileupload/FileUpload.js
@@ -15,7 +15,6 @@ export const FileUpload = React.memo(
         const fileInputRef = React.useRef(null);
         const messagesRef = React.useRef(null);
         const contentRef = React.useRef(null);
-        const duplicateIEEvent = React.useRef(false);
         const uploadedFileCount = React.useRef(0);
         const hasFiles = ObjectUtils.isNotEmpty(filesState);
         const disabled = props.disabled || uploadingState;
@@ -52,13 +51,6 @@ export const FileUpload = React.memo(
             }
         };
 
-        const clearIEInput = () => {
-            if (fileInputRef.current) {
-                duplicateIEEvent.current = true; //IE11 fix to prevent onFileChange trigger again
-                fileInputRef.current.value = '';
-            }
-        };
-
         const formatSize = (bytes) => {
             if (bytes === 0) {
                 return '0 B';
@@ -77,11 +69,6 @@ export const FileUpload = React.memo(
                 return;
             }
 
-            if (event.type !== 'drop' && isIE11() && duplicateIEEvent.current) {
-                duplicateIEEvent.current = false;
-                return;
-            }
-
             let currentFiles = [];
             if (props.multiple) {
                 currentFiles = filesState ? [...filesState] : [];
@@ -109,11 +96,7 @@ export const FileUpload = React.memo(
                 props.onSelect({ originalEvent: event, files: selectedFiles });
             }
 
-            if (event.type !== 'drop' && isIE11()) {
-                clearIEInput();
-            } else {
-                clearInput();
-            }
+            clearInput();
 
             if (props.mode === 'basic' && currentFiles.length > 0) {
                 fileInputRef.current.style.display = 'none';
@@ -124,10 +107,6 @@ export const FileUpload = React.memo(
             return filesState.some((f) => f.name + f.type + f.size === file.name + file.type + file.size);
         };
 
-        const isIE11 = () => {
-            return !!window['MSInputMethodContext'] && !!document['documentMode'];
-        };
-
         const validate = (file) => {
             if (props.maxFileSize && file.size > props.maxFileSize) {
                 const message = {