[TASK] Cleanup DataHandler - again and again