Remove unused commented code ...