[TASK] Cleanup some small leftovers