diff --git a/mythril/laser/ethereum/svm.py b/mythril/laser/ethereum/svm.py
index 256fd20f..2414710c 100644
--- a/mythril/laser/ethereum/svm.py
+++ b/mythril/laser/ethereum/svm.py
@@ -372,6 +372,8 @@ class LaserEVM:
                 # First execute the post hook for the transaction ending instruction
                 self._execute_post_hook(op_code, [end_signal.global_state])
 
+                # TODO: Remove the following section from the svm
+                # ================================================================
                 # Propogate codecall based annotations
                 if return_global_state.get_current_instruction()["opcode"] in (
                     "DELEGATECALL",
@@ -384,6 +386,7 @@ class LaserEVM:
                         )
                     ]
                     return_global_state.add_annotations(new_annotations)
+                # ================================================================
 
                 new_global_states = self._end_message_call(
                     copy(return_global_state),