[TASK] Removed legacy data handler hook code