@yoh : Adding and removing 5K lines for a new feature seems like a lot.
I commend your removal of many unneeded lines, via refactoring. But the size makes me think that this work must have been put off for a long time, to have grown so large, before you addressed it. I'd want to emphasize "clean as you go" to spread out the refactoring over time.
…