[TASK] Even more code cleanup