diff --git a/libs/remix-solidity/src/compiler/compiler.ts b/libs/remix-solidity/src/compiler/compiler.ts
index b26b2233b3..77e50a5845 100644
--- a/libs/remix-solidity/src/compiler/compiler.ts
+++ b/libs/remix-solidity/src/compiler/compiler.ts
@@ -367,20 +367,6 @@ export class Compiler {
 
   gatherImports(files: Source, importHints?: string[], cb?: gatherImportsCallbackInterface): void {
     importHints = importHints || []
-    // FIXME: This will only match imports if the file begins with one '.'
-    // It should tokenize by lines and check each.
-    const importRegex = /^\s*import\s*['"]([^'"]+)['"];/g
-    for (const fileName in files) {
-      let match: RegExpExecArray | null
-      while ((match = importRegex.exec(files[fileName].content))) {
-        let importFilePath = match[1]
-        if (importFilePath.startsWith('./')) {
-          const path: RegExpExecArray | null = /(.*\/).*/.exec(fileName)
-          importFilePath = path ? importFilePath.replace('./', path[1]) : importFilePath.slice(2)
-        }
-        if (!importHints.includes(importFilePath)) importHints.push(importFilePath)
-      }
-    }
     while (importHints.length > 0) {
       const m: string = importHints.pop() as string
       if (m && m in files) continue
diff --git a/package.json b/package.json
index 125f064ce1..38766d3bdb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "remix-project",
-  "version": "0.35.0-dev",
+  "version": "0.36.0-dev",
   "license": "MIT",
   "description": "Ethereum Remix Monorepo",
   "keywords": [
diff --git a/yarn.lock b/yarn.lock
index fee1a1cb27..ac7def07db 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4478,14 +4478,14 @@
     "@octokit/openapi-types" "^11.2.0"
 
 "@openzeppelin/contracts-upgradeable@^4.8.1":
-  version "4.9.2"
-  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.9.2.tgz#a817c75688f8daede420052fbcb34e52482e769e"
-  integrity sha512-siviV3PZV/fHfPaoIC51rf1Jb6iElkYWnNYZ0leO23/ukXuvOyoC/ahy8jqiV7g+++9Nuo3n/rk5ajSN/+d/Sg==
+  version "4.9.3"
+  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.9.3.tgz#ff17a80fb945f5102571f8efecb5ce5915cc4811"
+  integrity sha512-jjaHAVRMrE4UuZNfDwjlLGDxTHWIOwTJS2ldnc278a0gevfXfPr8hxKEVBGFBE96kl2G3VHDZhUimw/+G3TG2A==
 
 "@openzeppelin/contracts@^4.7.3":
-  version "4.9.2"
-  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.2.tgz#1cb2d5e4d3360141a17dbc45094a8cad6aac16c1"
-  integrity sha512-mO+y6JaqXjWeMh9glYVzVu8HYPGknAAnWyxTRhGeckOruyXQMNnlcW6w/Dx9ftLeIQk6N+ZJFuVmTwF7lEIFrg==
+  version "4.9.3"
+  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.3.tgz#00d7a8cf35a475b160b3f0293a6403c511099364"
+  integrity sha512-He3LieZ1pP2TNt5JbkPA4PNT9WC3gOTOlDcFGJW4Le4QKqwmiNJCRt44APfxMxvq7OugU/cqYuPcSBzOw38DAg==
 
 "@openzeppelin/upgrades-core@^1.22.0":
   version "1.22.0"