diff --git a/mythril/interfaces/cli.py b/mythril/interfaces/cli.py
index e1b1af75..8ceb7f13 100644
--- a/mythril/interfaces/cli.py
+++ b/mythril/interfaces/cli.py
@@ -563,7 +563,7 @@ def set_config(args: Namespace):
     ):
         config.set_api_from_config_path()
 
-    if args.__dict__.get("address", None):
+    if args.__dict__.get("rpc", None):
         # Establish RPC connection if necessary
         config.set_api_rpc(rpc=args.rpc, rpctls=args.rpctls)
     if args.command in ("hash-to-address", "leveldb-search"):
diff --git a/mythril/laser/ethereum/call.py b/mythril/laser/ethereum/call.py
index c179214e..5ad1943c 100644
--- a/mythril/laser/ethereum/call.py
+++ b/mythril/laser/ethereum/call.py
@@ -178,14 +178,6 @@ def get_call_data(
             else memory_size
         ),
     )
-
-    uses_entire_calldata = simplify(
-        memory_size == global_state.environment.calldata.calldatasize
-    )
-
-    if is_true(uses_entire_calldata):
-        return global_state.environment.calldata
-
     try:
         calldata_from_mem = state.memory[
             util.get_concrete_int(memory_start) : util.get_concrete_int(