[TASK] Remove commented-out lines