[TASK] Some cleanup