[TASK] Clean ups