[TASK] Cleanup DataHandler (again)