diff --git a/lib/core/enums.py b/lib/core/enums.py
index 88b7d4d67..3fd736403 100644
--- a/lib/core/enums.py
+++ b/lib/core/enums.py
@@ -70,7 +70,7 @@ class REFLECTIVE_COUNTER:
class HASH:
MYSQL = r'(?i)\A\*[0-9a-f]{40}\Z'
- MYSQL_OLD = r'(?i)\A(?![0-9]{16})[0-9a-f]{16}\Z'
+ MYSQL_OLD = r'(?i)\A(?![0-9]+\Z)[0-9a-f]{16}\Z'
POSTGRES = r'(?i)\Amd5[0-9a-f]{32}\Z'
MSSQL = r'(?i)\A0x0100[0-9a-f]{8}[0-9a-f]{40}\Z'
MSSQL_OLD = r'(?i)\A0x0100[0-9a-f]{8}[0-9a-f]{80}\Z'
@@ -78,7 +78,7 @@ class HASH:
ORACLE_OLD = r'(?i)\A[01-9a-f]{16}\Z'
MD5_GENERIC = r'(?i)\A[0-9a-f]{32}\Z'
SHA1_GENERIC = r'(?i)\A[0-9a-f]{40}\Z'
- CRYPT_GENERIC = r'(?i)\A(?![0-9]{13})[./0-9A-Za-z]{13}\Z'
+ CRYPT_GENERIC = r'(?i)\A(?!\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\Z)(?![0-9]+\Z)[./0-9A-Za-z]{13}\Z'
WORDPRESS = r'(?i)\A\$P\$[./0-9A-Za-z]{31}\Z'
# Reference: http://www.zytrax.com/tech/web/mobile_ids.html
diff --git a/lib/core/option.py b/lib/core/option.py
index 653768d83..a2692f949 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -85,7 +85,6 @@ from lib.core.settings import DEFAULT_GET_POST_DELIMITER
from lib.core.settings import DEFAULT_PAGE_ENCODING
from lib.core.settings import DEFAULT_TOR_HTTP_PORTS
from lib.core.settings import DEFAULT_TOR_SOCKS_PORT
-from lib.core.settings import GENERAL_IP_ADDRESS_REGEX
from lib.core.settings import IS_WIN
from lib.core.settings import PLATFORM
from lib.core.settings import PYVERSION
diff --git a/lib/core/settings.py b/lib/core/settings.py
index 8e8133a4e..9fafa06f7 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -253,9 +253,6 @@ META_REFRESH_REGEX = r']+content="?[^">]+url=(?P<
# Regular expression used for parsing empty fields in tested form data
EMPTY_FORM_FIELDS_REGEX = r'(?P[^=]+=(&|\Z))'
-# Regular expression for general IP address matching
-GENERAL_IP_ADDRESS_REGEX = r'\A\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\Z'
-
# Regular expression for soap message recognition
SOAP_REGEX = r"\A(<\?xml[^>]+>)?\s*