[TASK] Clean up some commented code