Remove unused commented parts